From 0989fd71ddca06459082a786d679976535e2739b Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Sat, 22 Apr 2017 07:57:54 -0400
Subject: [PATCH] civicdm-47: update to 4.7.18
---
civicrm/CRM/Activity/Form/Task/Batch.php | 44 +-
.../CRM/Activity/Import/Parser/Activity.php | 2 +-
civicrm/CRM/Admin/Form/Navigation.php | 2 +-
civicrm/CRM/Admin/Form/PaymentProcessor.php | 31 +-
.../CRM/Admin/Form/Preferences/Contribute.php | 7 -
.../CRM/Admin/Form/Setting/Localization.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Search.php | 1 +
civicrm/CRM/Admin/Page/AJAX.php | 8 -
civicrm/CRM/Admin/Page/Navigation.php | 4 +-
civicrm/CRM/Batch/BAO/Batch.php | 20 +-
civicrm/CRM/Batch/Form/Entry.php | 91 +--
civicrm/CRM/Case/BAO/Case.php | 31 +-
civicrm/CRM/Case/DAO/Case.php | 3 +-
civicrm/CRM/Contact/BAO/Contact.php | 13 +-
.../CRM/Contact/BAO/Contact/Permission.php | 2 +-
civicrm/CRM/Contact/BAO/ContactType.php | 2 +-
civicrm/CRM/Contact/BAO/Group.php | 2 +-
civicrm/CRM/Contact/BAO/Query.php | 92 ++-
civicrm/CRM/Contact/Form/DedupeRules.php | 3 +
.../CRM/Contact/Form/Edit/Demographics.php | 4 +-
civicrm/CRM/Contact/Form/Merge.php | 275 ++++-----
civicrm/CRM/Contact/Form/Search/Criteria.php | 2 +
.../Contact/Form/Search/Custom/FullText.php | 10 +-
.../CRM/Contact/Page/Inline/Demographics.php | 4 +-
civicrm/CRM/Contact/Page/View/Summary.php | 7 +-
civicrm/CRM/Contact/Page/View/Vcard.php | 4 +-
civicrm/CRM/Contact/Selector.php | 3 +
civicrm/CRM/Contribute/BAO/Contribution.php | 139 +++--
civicrm/CRM/Contribute/BAO/Query.php | 78 +--
civicrm/CRM/Contribute/Controller/Search.php | 7 -
civicrm/CRM/Contribute/DAO/Contribution.php | 8 +-
.../CRM/Contribute/Form/CloseAccPeriod.php | 133 ----
civicrm/CRM/Contribute/Form/Contribution.php | 23 +-
.../Contribute/Form/Contribution/Confirm.php | 8 +
.../CRM/Contribute/Form/Contribution/Main.php | 7 +
.../Contribute/Form/Contribution/ThankYou.php | 25 +-
civicrm/CRM/Contribute/Form/Task.php | 16 +
civicrm/CRM/Contribute/Form/Task/PDF.php | 2 +-
civicrm/CRM/Contribute/Selector/Search.php | 17 +-
.../CRM/Contribute/xml/Menu/Contribute.xml | 9 -
civicrm/CRM/Core/BAO/Cache.php | 7 +-
civicrm/CRM/Core/BAO/CustomField.php | 2 +-
civicrm/CRM/Core/BAO/Domain.php | 35 +-
civicrm/CRM/Core/BAO/Log.php | 18 +-
civicrm/CRM/Core/BAO/Mapping.php | 2 +-
civicrm/CRM/Core/BAO/MessageTemplate.php | 4 +-
civicrm/CRM/Core/BAO/Navigation.php | 218 +++----
civicrm/CRM/Core/BAO/OptionGroup.php | 35 ++
civicrm/CRM/Core/BAO/Phone.php | 4 +-
civicrm/CRM/Core/BAO/PrevNextCache.php | 37 +-
civicrm/CRM/Core/BAO/Setting.php | 7 -
civicrm/CRM/Core/BAO/Tag.php | 19 +-
civicrm/CRM/Core/BAO/UFGroup.php | 79 +--
civicrm/CRM/Core/CodeGen/Specification.php | 8 +-
civicrm/CRM/Core/DAO.php | 35 +-
civicrm/CRM/Core/DAO/AllCoreTables.data.php | 2 +-
civicrm/CRM/Core/DAO/permissions.php | 571 +----------------
civicrm/CRM/Core/Error.php | 10 +-
civicrm/CRM/Core/Form.php | 26 +-
civicrm/CRM/Core/Page.php | 24 +
civicrm/CRM/Core/Payment.php | 36 ++
civicrm/CRM/Core/Payment/AuthorizeNet.php | 3 +-
civicrm/CRM/Core/Payment/BaseIPN.php | 6 +-
civicrm/CRM/Core/Permission.php | 583 ++++++++++++++++++
civicrm/CRM/Core/Reference/Basic.php | 9 +-
civicrm/CRM/Core/Resources.php | 18 +-
civicrm/CRM/Core/SelectValues.php | 29 +-
.../Core/Smarty/plugins/function.crmStyle.php | 3 +
.../Core/Smarty/plugins/modifier.crmDate.php | 4 -
civicrm/CRM/Core/xml/Menu/Admin.xml | 9 +-
civicrm/CRM/Core/xml/Menu/Contact.xml | 1 +
civicrm/CRM/Dedupe/Merger.php | 17 +-
civicrm/CRM/Event/BAO/Participant.php | 17 +-
civicrm/CRM/Event/Form/Task/Batch.php | 14 +-
civicrm/CRM/Event/Selector/Search.php | 8 +
.../CRM/Financial/BAO/PaymentProcessor.php | 27 +
.../CRM/Financial/DAO/PaymentProcessor.php | 31 +-
civicrm/CRM/Financial/Form/Payment.php | 4 +-
civicrm/CRM/Financial/Page/AJAX.php | 4 +-
civicrm/CRM/Group/Page/Group.php | 2 +-
civicrm/CRM/Mailing/BAO/Mailing.php | 7 +-
civicrm/CRM/Member/BAO/Membership.php | 2 +-
civicrm/CRM/Member/Form/Task/Batch.php | 3 +-
civicrm/CRM/Price/BAO/PriceField.php | 9 +
.../Page/MultipleRecordFieldsListing.php | 2 +-
civicrm/CRM/Report/Form.php | 173 ++++--
civicrm/CRM/Report/Form/Activity.php | 12 +-
.../CRM/Report/Form/Contact/Relationship.php | 2 +-
.../Report/Form/Contribute/Bookkeeping.php | 16 +
.../Form/Contribute/DeferredRevenue.php | 397 ++++++++----
civicrm/CRM/Report/Form/Contribute/Lybunt.php | 1 +
civicrm/CRM/Report/Form/Contribute/Repeat.php | 18 +-
.../CRM/Report/Form/Contribute/Summary.php | 33 +
civicrm/CRM/Report/Form/Event/Income.php | 10 +-
.../Report/Form/Member/ContributionDetail.php | 1 +
civicrm/CRM/Tag/Form/Tag.php | 11 -
civicrm/CRM/UF/Form/Field.php | 2 +-
civicrm/CRM/Upgrade/Incremental/Base.php | 16 +
.../CRM/Upgrade/Incremental/php/FourSeven.php | 62 ++
.../Upgrade/Incremental/sql/4.7.18.mysql.tpl | 79 +++
.../Upgrade/Incremental/sql/4.7.8.mysql.tpl | 5 -
civicrm/CRM/Utils/Array.php | 10 +-
civicrm/CRM/Utils/Date.php | 98 +--
civicrm/CRM/Utils/File.php | 2 +-
civicrm/CRM/Utils/Geocode/Google.php | 2 +-
civicrm/CRM/Utils/Geocode/Yahoo.php | 2 +-
civicrm/CRM/Utils/Hook/UnitTests.php | 23 +-
civicrm/CRM/Utils/Hook/WordPress.php | 2 +-
civicrm/CRM/Utils/HttpClient.php | 5 -
civicrm/CRM/Utils/Mail/EmailProcessor.php | 20 +-
civicrm/CRM/Utils/Rule.php | 15 +
civicrm/CRM/Utils/System/Drupal8.php | 16 +
civicrm/CRM/Utils/System/DrupalBase.php | 2 +-
civicrm/CRM/Utils/Type.php | 41 +-
civicrm/Civi/API/Api3SelectQuery.php | 2 +-
civicrm/Civi/API/Events.php | 10 +-
civicrm/Civi/API/ExternalBatch.php | 2 +-
.../Civi/API/Subscriber/WrapperAdapter.php | 2 +-
civicrm/Civi/ActionSchedule/Events.php | 4 +-
civicrm/Civi/Core/Container.php | 6 +-
civicrm/Civi/Install/Requirements.php | 38 +-
civicrm/Civi/Test/CiviTestListener.php | 2 +-
civicrm/Civi/Token/TokenCompatSubscriber.php | 3 +-
civicrm/ang/crmMailing/EditRecipCtrl.js | 2 +
.../EditRecipOptionsDialogCtrl.html | 3 -
civicrm/ang/crmMailingAB/BlockSetup.html | 2 +-
civicrm/api/v3/Activity.php | 37 +-
civicrm/api/v3/Case.php | 128 +++-
civicrm/api/v3/CaseType.php | 27 +-
civicrm/api/v3/Contribution.php | 1 +
civicrm/api/v3/Generic.php | 3 +
civicrm/api/v3/Job.php | 22 +-
civicrm/api/v3/Order.php | 3 +-
.../v3/examples/Contact/APIChainedArray.php | 9 +-
.../Contact/APIChainedArrayFormats.php | 1 +
.../Contact/APIChainedArrayMultipleCustom.php | 1 +
.../ContactIDOfLoggedInUserContactAPI.php | 143 +++++
civicrm/api/v3/examples/Contact/Get.php | 1 +
.../v3/examples/Contact/GetSingleContact.php | 1 +
.../Contact/GroupFilterUsingContactAPI.php | 1 +
civicrm/api/v3/examples/Setting/GetFields.php | 30 -
civicrm/civicrm-version.php | 4 +-
civicrm/composer.lock | 49 +-
civicrm/css/civicrmNavigation.css | 3 +-
civicrm/css/contactSummary.css | 16 +-
civicrm/css/print.css | 5 +
civicrm/install/civicrm.php | 16 +-
civicrm/js/Common.js | 77 +--
civicrm/js/jquery/jquery.crmAjaxTable.js | 59 ++
civicrm/js/jquery/jquery.crmeditable.js | 12 +-
civicrm/release-notes.md | 9 +
civicrm/release-notes/4.7.18.md | 570 +++++++++++++++++
civicrm/settings/Contribute.setting.php | 30 -
civicrm/settings/Search.setting.php | 14 +
civicrm/sql/civicrm.mysql | 4 +-
civicrm/sql/civicrm_data.mysql | 85 ++-
civicrm/sql/civicrm_dummy_processor.mysql | 4 +-
civicrm/sql/civicrm_generated.mysql | 10 +-
civicrm/sql/civicrm_navigation.mysql | 1 -
.../CRM/Activity/Form/ActivityLinks.tpl | 3 +-
.../CRM/Activity/Form/Task/Batch.tpl | 6 +-
.../CRM/Admin/Form/Preferences/Contribute.tpl | 13 -
.../CRM/Admin/Form/Setting/Search.tpl | 6 +
.../templates/CRM/Admin/Page/Navigation.tpl | 179 +++---
civicrm/templates/CRM/Batch/Form/Entry.tpl | 7 +-
.../CRM/Campaign/Form/Search/Campaign.tpl | 3 +-
.../CRM/Campaign/Form/Search/Petition.tpl | 3 +-
.../CRM/Campaign/Form/Search/Survey.tpl | 3 +-
.../CRM/Contact/Form/Edit/Demographics.tpl | 4 +-
.../CRM/Contact/Form/Edit/TagsAndGroups.tpl | 11 +-
.../CRM/Contact/Form/Inline/Demographics.tpl | 4 +-
.../Contact/Form/Search/Criteria/Location.tpl | 10 +-
.../templates/CRM/Contact/Form/Task/Batch.tpl | 2 -
.../CRM/Contact/Page/Inline/Demographics.tpl | 14 +-
.../CRM/Contribute/Form/CloseAccPeriod.tpl | 34 -
.../CRM/Contribute/Form/Contribution.tpl | 3 +-
.../CRM/Contribute/Form/Contribution/Main.tpl | 8 +-
.../Contribute/Form/Contribution/ThankYou.tpl | 2 +-
.../CRM/Contribute/Form/Search/Common.tpl | 4 +
.../CRM/Contribute/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Core/BillingBlock.js | 44 +-
civicrm/templates/CRM/Custom/Page/Option.tpl | 3 +-
civicrm/templates/CRM/Dashlet/Page/Blog.tpl | 7 +-
.../templates/CRM/Event/Form/Task/Batch.tpl | 2 -
.../templates/CRM/Financial/Form/Search.tpl | 3 +-
civicrm/templates/CRM/Form/basicForm.tpl | 8 +-
civicrm/templates/CRM/Group/Form/Search.tpl | 10 +-
.../templates/CRM/Member/Form/Task/Batch.tpl | 6 +-
.../templates/CRM/Price/Form/Calculate.tpl | 3 +-
.../templates/CRM/Profile/Form/Dynamic.tpl | 7 +-
civicrm/templates/CRM/Profile/Form/Search.tpl | 4 +-
civicrm/templates/CRM/Tag/Form/Tag.tpl | 90 ++-
civicrm/templates/CRM/Tag/Form/Tagtree.tpl | 9 +-
civicrm/templates/CRM/Tag/Page/Tag.tpl | 4 -
civicrm/templates/CRM/UF/Form/Fields.tpl | 3 +-
civicrm/templates/CRM/UF/Page/Field.tpl | 2 +-
.../templates/CRM/common/enableDisableApi.tpl | 8 +-
civicrm/templates/CRM/common/version.tpl | 2 +-
civicrm/vendor/autoload.php | 4 +-
civicrm/vendor/composer/ClassLoader.php | 74 ++-
civicrm/vendor/composer/LICENSE | 21 +
civicrm/vendor/composer/autoload_files.php | 4 +-
civicrm/vendor/composer/autoload_real.php | 55 +-
civicrm/vendor/composer/autoload_static.php | 305 +++++++++
civicrm/vendor/composer/installed.json | 50 +-
.../mail/src/transports/file/file_set.php | 2 -
.../mail/src/transports/variable/var_set.php | 2 -
includes/civicrm.basepage.php | 94 ++-
208 files changed, 4273 insertions(+), 2534 deletions(-)
delete mode 100644 civicrm/CRM/Contribute/Form/CloseAccPeriod.php
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl
create mode 100644 civicrm/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.php
create mode 100644 civicrm/js/jquery/jquery.crmAjaxTable.js
create mode 100644 civicrm/release-notes/4.7.18.md
delete mode 100644 civicrm/templates/CRM/Contribute/Form/CloseAccPeriod.tpl
create mode 100644 civicrm/vendor/composer/LICENSE
create mode 100644 civicrm/vendor/composer/autoload_static.php
diff --git a/civicrm/CRM/Activity/Form/Task/Batch.php b/civicrm/CRM/Activity/Form/Task/Batch.php
index 980ef2c808..72a72febc1 100644
--- a/civicrm/CRM/Activity/Form/Task/Batch.php
+++ b/civicrm/CRM/Activity/Form/Task/Batch.php
@@ -95,7 +95,7 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
$ufGroupId = $this->get('ufGroupId');
if (!$ufGroupId) {
- CRM_Core_Error::fatal('ufGroupId is missing');
+ throw new CRM_Core_Exception('The profile id is missing');
}
$this->_title = ts('Update multiple activities') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId);
CRM_Utils_System::setTitle($this->_title);
@@ -108,7 +108,7 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
$suppressFields = FALSE;
$removehtmlTypes = array('File', 'Autocomplete-Select');
foreach ($this->_fields as $name => $field) {
- if ($cfID = CRM_Core_BAO_CustomField::getKeyID($name) &&
+ if (CRM_Core_BAO_CustomField::getKeyID($name) &&
in_array($this->_fields[$name]['html_type'], $removehtmlTypes)
) {
$suppressFields = TRUE;
@@ -150,6 +150,10 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
}
$customFields = CRM_Core_BAO_CustomField::getFields('Activity');
+ // It is possible to have fields that are required in CiviCRM not be required in the
+ // profile. Overriding that here. Perhaps a better approach would be to
+ // make them required in the schema & read that up through getFields functionality.
+ $requiredFields = array('activity_date_time');
foreach ($this->_activityHolderIds as $activityId) {
$typeId = CRM_Core_DAO::getFieldValue("CRM_Activity_DAO_Activity", $activityId, 'activity_type_id');
@@ -169,6 +173,9 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
}
else {
// Handle non custom fields.
+ if (in_array($field['name'], $requiredFields)) {
+ $field['is_required'] = TRUE;
+ }
CRM_Core_BAO_UFGroup::buildProfile($this, $field, NULL, $activityId);
}
}
@@ -216,10 +223,6 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
);
$value['id'] = $key;
- if (!empty($value['activity_date_time'])) {
- $value['activity_date_time'] = CRM_Utils_Date::processDate($value['activity_date_time'], $value['activity_date_time_time']);
- }
-
if (!empty($value['activity_status_id'])) {
$value['status_id'] = $value['activity_status_id'];
}
@@ -228,10 +231,6 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
$value['details'] = $value['activity_details'];
}
- if (!empty($value['activity_duration'])) {
- $value['duration'] = $value['activity_duration'];
- }
-
if (!empty($value['activity_location'])) {
$value['location'] = $value['activity_location'];
}
@@ -240,30 +239,9 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
$value['subject'] = $value['activity_subject'];
}
- $query = "
-SELECT a.activity_type_id, ac.contact_id
-FROM civicrm_activity a
-JOIN civicrm_activity_contact ac ON ( ac.activity_id = a.id
-AND ac.record_type_id = %2 )
-WHERE a.id = %1 ";
- $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
- $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
- $params = array(1 => array($key, 'Integer'), 2 => array($sourceID, 'Integer'));
- $dao = CRM_Core_DAO::executeQuery($query, $params);
- $dao->fetch();
-
- // Get Activity Type ID
- $value['activity_type_id'] = $dao->activity_type_id;
-
- // Get Conatct ID
- $value['source_contact_id'] = $dao->contact_id;
-
- // make call use API 3
- $value['version'] = 3;
-
- $activityId = civicrm_api('activity', 'update', $value);
+ $activityId = civicrm_api3('activity', 'create', $value);
- // add custom field values
+ // @todo this would be done by the api call above if the parames were passed through.
if (!empty($value['custom']) &&
is_array($value['custom'])
) {
diff --git a/civicrm/CRM/Activity/Import/Parser/Activity.php b/civicrm/CRM/Activity/Import/Parser/Activity.php
index ea2ac9d288..4e41cf675b 100644
--- a/civicrm/CRM/Activity/Import/Parser/Activity.php
+++ b/civicrm/CRM/Activity/Import/Parser/Activity.php
@@ -267,7 +267,7 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser {
$params['source_contact_id'] = $session->get('userID');
}
- $customFields = CRM_Core_BAO_CustomField::getFields(CRM_Utils_Array::value('contact_type', $params));
+ $customFields = CRM_Core_BAO_CustomField::getFields('Activity');
foreach ($params as $key => $val) {
if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
diff --git a/civicrm/CRM/Admin/Form/Navigation.php b/civicrm/CRM/Admin/Form/Navigation.php
index 37c0822536..1441b7d7a0 100644
--- a/civicrm/CRM/Admin/Form/Navigation.php
+++ b/civicrm/CRM/Admin/Form/Navigation.php
@@ -106,7 +106,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
* @return array
*/
public function setDefaultValues() {
- $defaults = $this->_defaults;
+ $defaults = parent::setDefaultValues();
if (isset($this->_id)) {
//Take parent id in object variable to calculate the menu
//weight if menu parent id changed
diff --git a/civicrm/CRM/Admin/Form/PaymentProcessor.php b/civicrm/CRM/Admin/Form/PaymentProcessor.php
index efb4475355..e444eea37a 100644
--- a/civicrm/CRM/Admin/Form/PaymentProcessor.php
+++ b/civicrm/CRM/Admin/Form/PaymentProcessor.php
@@ -43,16 +43,18 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
protected $_ppDAO;
+ /**
+ * Get the name of the base entity being edited.
+ *
+ * @return string
+ */
+ public function getDefaultEntity() {
+ return 'PaymentProcessor';
+ }
+
public function preProcess() {
- if (!CRM_Core_Permission::check('administer payment processors')) {
- CRM_Core_Error::statusBounce('The \'administer payment processors\' permission is required to add or edit a payment processor.');
- }
parent::preProcess();
- CRM_Utils_System::setTitle(ts('Settings - Payment Processor'));
-
- // get the payment processor meta information
-
if ($this->_id) {
$this->_ppType = CRM_Utils_Request::retrieve('pp', 'String', $this, FALSE, NULL);
if (!$this->_ppType) {
@@ -77,9 +79,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
$this->_ppDAO = new CRM_Financial_DAO_PaymentProcessorType();
$this->_ppDAO->id = $this->_ppType;
- if (!$this->_ppDAO->find(TRUE)) {
- CRM_Core_Error::fatal(ts('Could not find payment processor meta information'));
- }
+ $this->_ppDAO->find(TRUE);
if ($this->_id) {
$refreshURL = CRM_Utils_System::url('civicrm/admin/paymentProcessor',
@@ -221,10 +221,13 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
continue;
}
- $this->add('text', $field['name'],
- $field['label'], $attributes[$field['name']]
- );
- $this->add('text', "test_{$field['name']}",
+ $this->addField($field['name'], array('label' => $field['label']));
+
+ $fieldSpec = civicrm_api3($this->getDefaultEntity(), 'getfield', array(
+ 'name' => $field['name'],
+ 'action' => 'create',
+ ));
+ $this->add($fieldSpec['values']['html']['type'], "test_{$field['name']}",
$field['label'], $attributes[$field['name']]
);
if (!empty($field['rule'])) {
diff --git a/civicrm/CRM/Admin/Form/Preferences/Contribute.php b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
index 2027fdf1f1..e07b876a3f 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Contribute.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
@@ -41,9 +41,6 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
'always_post_to_accounts_receivable' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
'deferred_revenue_enabled' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
'default_invoice_page' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
- 'financial_account_bal_enable' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
- 'fiscalYearStart' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
- 'prior_financial_period' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
'invoicing' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
);
@@ -217,9 +214,6 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
)
);
}
- $defaults['fiscalYearStart'] = Civi::settings()->get('fiscalYearStart');
- $period = CRM_Contribute_BAO_Contribution::checkContributeSettings('prior_financial_period');
- $this->assign('priorFinancialPeriod', $period);
return $defaults;
}
@@ -232,7 +226,6 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
unset($params['qfKey']);
unset($params['entryURL']);
Civi::settings()->set('contribution_invoice_settings', $params);
- Civi::settings()->set('fiscalYearStart', $params['fiscalYearStart']);
// to set default value for 'Invoices / Credit Notes' checkbox on display preferences
$values = CRM_Core_BAO_Setting::getItem("CiviCRM Preferences");
diff --git a/civicrm/CRM/Admin/Form/Setting/Localization.php b/civicrm/CRM/Admin/Form/Setting/Localization.php
index bae910d9ff..8e2b2718ab 100644
--- a/civicrm/CRM/Admin/Form/Setting/Localization.php
+++ b/civicrm/CRM/Admin/Form/Setting/Localization.php
@@ -88,7 +88,7 @@ class CRM_Admin_Form_Setting_Localization extends CRM_Admin_Form_Setting {
$validTriggerPermission = CRM_Core_DAO::checkTriggerViewPermission(TRUE);
if ($validTriggerPermission &&
- !$config->logging
+ !\Civi::settings()->get('logging')
) {
$this->addElement('checkbox', 'makeMultilingual', ts('Enable Multiple Languages'),
NULL, array('onChange' => "if (this.checked) CRM.alert($warning, $warningTitle)")
diff --git a/civicrm/CRM/Admin/Form/Setting/Search.php b/civicrm/CRM/Admin/Form/Setting/Search.php
index 006aca2de0..5d4a3b2245 100644
--- a/civicrm/CRM/Admin/Form/Setting/Search.php
+++ b/civicrm/CRM/Admin/Form/Setting/Search.php
@@ -49,6 +49,7 @@ class CRM_Admin_Form_Setting_Search extends CRM_Admin_Form_Setting {
'includeOrderByClause' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
'smartGroupCacheTimeout' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
'defaultSearchProfileID' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
+ 'searchPrimaryDetailsOnly' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
);
/**
diff --git a/civicrm/CRM/Admin/Page/AJAX.php b/civicrm/CRM/Admin/Page/AJAX.php
index ebf77802a8..35f5f2aabd 100644
--- a/civicrm/CRM/Admin/Page/AJAX.php
+++ b/civicrm/CRM/Admin/Page/AJAX.php
@@ -54,14 +54,6 @@ class CRM_Admin_Page_AJAX {
CRM_Utils_System::civiExit();
}
- /**
- * Return menu tree as json data for editing.
- */
- public static function getNavigationList() {
- echo CRM_Core_BAO_Navigation::buildNavigation(TRUE, FALSE);
- CRM_Utils_System::civiExit();
- }
-
/**
* Process drag/move action for menu tree.
*/
diff --git a/civicrm/CRM/Admin/Page/Navigation.php b/civicrm/CRM/Admin/Page/Navigation.php
index 22561bee50..d22d8be7cd 100644
--- a/civicrm/CRM/Admin/Page/Navigation.php
+++ b/civicrm/CRM/Admin/Page/Navigation.php
@@ -105,8 +105,8 @@ class CRM_Admin_Page_Navigation extends CRM_Core_Page_Basic {
// Add jstree support
CRM_Core_Resources::singleton()
- ->addScriptFile('civicrm', 'packages/jquery/plugins/jstree/jquery.jstree.js', 0, 'html-header', FALSE)
- ->addStyleFile('civicrm', 'packages/jquery/plugins/jstree/themes/default/style.css', 0, 'html-header');
+ ->addScriptFile('civicrm', 'bower_components/jstree/dist/jstree.min.js', 0, 'html-header')
+ ->addStyleFile('civicrm', 'bower_components/jstree/dist/themes/default/style.min.css');
}
}
diff --git a/civicrm/CRM/Batch/BAO/Batch.php b/civicrm/CRM/Batch/BAO/Batch.php
index f5ce3e4e04..cd9f06f509 100644
--- a/civicrm/CRM/Batch/BAO/Batch.php
+++ b/civicrm/CRM/Batch/BAO/Batch.php
@@ -648,10 +648,11 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
}
$from = "civicrm_financial_trxn
-LEFT JOIN civicrm_entity_financial_trxn ON civicrm_entity_financial_trxn.financial_trxn_id = civicrm_financial_trxn.id
+INNER JOIN civicrm_entity_financial_trxn ON civicrm_entity_financial_trxn.financial_trxn_id = civicrm_financial_trxn.id
+INNER JOIN civicrm_contribution ON (civicrm_contribution.id = civicrm_entity_financial_trxn.entity_id
+ AND civicrm_entity_financial_trxn.entity_table='civicrm_contribution')
LEFT JOIN civicrm_entity_batch ON civicrm_entity_batch.entity_table = 'civicrm_financial_trxn'
AND civicrm_entity_batch.entity_id = civicrm_financial_trxn.id
-LEFT JOIN civicrm_contribution ON civicrm_contribution.id = civicrm_entity_financial_trxn.entity_id
LEFT JOIN civicrm_financial_type ON civicrm_financial_type.id = civicrm_contribution.financial_type_id
LEFT JOIN civicrm_contact contact_a ON contact_a.id = civicrm_contribution.contact_id
LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id = civicrm_contribution.id
@@ -722,24 +723,15 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id
}
if (!empty($query->_where[0])) {
$where = implode(' AND ', $query->_where[0]) .
- " AND civicrm_entity_batch.batch_id IS NULL
- AND civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution'";
+ " AND civicrm_entity_batch.batch_id IS NULL ";
$where = str_replace('civicrm_contribution.payment_instrument_id', 'civicrm_financial_trxn.payment_instrument_id', $where);
- $searchValue = TRUE;
}
else {
- $searchValue = FALSE;
- }
-
- if (!$searchValue) {
if (!$notPresent) {
- $where = " ( civicrm_entity_batch.batch_id = {$entityID}
- AND civicrm_entity_batch.entity_table = 'civicrm_financial_trxn'
- AND civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution') ";
+ $where = " civicrm_entity_batch.batch_id = {$entityID} ";
}
else {
- $where = " ( civicrm_entity_batch.batch_id IS NULL
- AND civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution')";
+ $where = " civicrm_entity_batch.batch_id IS NULL ";
}
}
diff --git a/civicrm/CRM/Batch/Form/Entry.php b/civicrm/CRM/Batch/Form/Entry.php
index 60e967723d..b5900b0444 100644
--- a/civicrm/CRM/Batch/Form/Entry.php
+++ b/civicrm/CRM/Batch/Form/Entry.php
@@ -384,7 +384,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
$completeStatus = CRM_Contribute_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
$specialFields = array(
- 'join_date' => $currentDate,
+ 'join_date' => date('Y-m-d'),
'receive_date' => $currentDate,
'receive_date_time' => $currentTime,
'contribution_status_id' => $completeStatus,
@@ -414,7 +414,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
$params['actualBatchTotal'] = 0;
// get the profile information
- $batchTypes = CRM_Core_Pseudoconstant::get('CRM_Batch_DAO_Batch', 'type_id', array('flip' => 1), 'validate');
+ $batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id', array('flip' => 1), 'validate');
if (in_array($this->_batchInfo['type_id'], array($batchTypes['Pledge Payment'], $batchTypes['Contribution']))) {
$this->processContribution($params);
}
@@ -637,24 +637,13 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
* @return bool
*/
private function processMembership(&$params) {
- $dateTypes = array(
- 'join_date' => 'joinDate',
- 'membership_start_date' => 'startDate',
- 'membership_end_date' => 'endDate',
- );
-
- $dates = array(
- 'join_date',
- 'start_date',
- 'end_date',
- 'reminder_date',
- );
// 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));
if (isset($params['field'])) {
+ // @todo - most of the wrangling in this function is because the api is not being used, especially date stuff.
$customFields = array();
foreach ($params['field'] as $key => $value) {
// if contact is not selected we should skip the row
@@ -669,28 +658,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
$membershipTypeId = $value['membership_type_id'] = $value['membership_type'][1];
- foreach ($dateTypes as $dateField => $dateVariable) {
- $$dateVariable = CRM_Utils_Date::processDate($value[$dateField]);
- $fDate[$dateField] = CRM_Utils_Array::value($dateField, $value);
- }
-
- $calcDates = array();
- $calcDates[$membershipTypeId] = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeId,
- $joinDate, $startDate, $endDate
- );
-
- foreach ($calcDates as $memType => $calcDate) {
- foreach ($dates as $d) {
- //first give priority to form values then calDates.
- $date = CRM_Utils_Array::value($d, $value);
- if (!$date) {
- $date = CRM_Utils_Array::value($d, $calcDate);
- }
-
- $value[$d] = CRM_Utils_Date::processDate($date);
- }
- }
-
if (!empty($value['send_receipt'])) {
$value['receipt_date'] = date('Y-m-d His');
}
@@ -810,8 +777,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
// end of contribution related section
unset($value['membership_type']);
- unset($value['membership_start_date']);
- unset($value['membership_end_date']);
$value['is_renew'] = FALSE;
if (!empty($params['member_option']) && CRM_Utils_Array::value($key, $params['member_option']) == 2) {
@@ -827,12 +792,11 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
$campaignId = CRM_Utils_Array::value('campaign_id', $this->_values);
}
}
- foreach (array('join_date', 'start_date', 'end_date') as $dateType) {
- //CRM-18000 - ignore $dateType if its not explicitly passed
- if (!empty($fDate[$dateType]) || !empty($fDate['membership_' . $dateType])) {
- $formDates[$dateType] = CRM_Utils_Array::value($dateType, $value);
- }
- }
+
+ $formDates = array(
+ 'end_date' => CRM_Utils_Array::value('membership_end_date', $value),
+ 'start_date' => CRM_Utils_Array::value('membership_start_date', $value),
+ );
$membershipSource = CRM_Utils_Array::value('source', $value);
list($membership) = CRM_Member_BAO_Membership::processMembership(
$value['contact_id'], $value['membership_type_id'], FALSE,
@@ -848,7 +812,44 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
CRM_Member_BAO_Membership::recordMembershipContribution($contrbutionParams);
}
else {
- $membership = CRM_Member_BAO_Membership::create($value, CRM_Core_DAO::$_nullArray);
+ $dateTypes = array(
+ 'join_date' => 'joinDate',
+ 'membership_start_date' => 'startDate',
+ 'membership_end_date' => 'endDate',
+ );
+
+ $dates = array(
+ 'join_date',
+ 'start_date',
+ 'end_date',
+ 'reminder_date',
+ );
+ foreach ($dateTypes as $dateField => $dateVariable) {
+ $$dateVariable = CRM_Utils_Date::processDate($value[$dateField]);
+ $fDate[$dateField] = CRM_Utils_Array::value($dateField, $value);
+ }
+
+ $calcDates = array();
+ $calcDates[$membershipTypeId] = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeId,
+ $joinDate, $startDate, $endDate
+ );
+
+ foreach ($calcDates as $memType => $calcDate) {
+ foreach ($dates as $d) {
+ //first give priority to form values then calDates.
+ $date = CRM_Utils_Array::value($d, $value);
+ if (!$date) {
+ $date = CRM_Utils_Array::value($d, $calcDate);
+ }
+
+ $value[$d] = CRM_Utils_Date::processDate($date);
+ }
+ }
+
+ unset($value['membership_start_date']);
+ unset($value['membership_end_date']);
+ $ids = array();
+ $membership = CRM_Member_BAO_Membership::create($value, $ids);
}
//process premiums
diff --git a/civicrm/CRM/Case/BAO/Case.php b/civicrm/CRM/Case/BAO/Case.php
index e6a0fa129c..e76b348cd3 100644
--- a/civicrm/CRM/Case/BAO/Case.php
+++ b/civicrm/CRM/Case/BAO/Case.php
@@ -1204,17 +1204,28 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
*
* @param int $caseID
* Case id.
- * @param bool $skipDetails
+ * @param bool $includeDetails
* If true include details of contacts.
*
* @return array
* array of return properties
*
*/
- public static function getRelatedContacts($caseID, $skipDetails = FALSE) {
+ public static function getRelatedContacts($caseID, $includeDetails = TRUE) {
+ $caseRoles = array();
+ if ($includeDetails) {
+ $caseInfo = civicrm_api3('Case', 'getsingle', array(
+ 'id' => $caseID,
+ // Most efficient way of retrieving definition is to also include case type id and name so the api doesn't have to look it up separately
+ 'return' => array('case_type_id', 'case_type_id.name', 'case_type_id.definition'),
+ ));
+ if (!empty($caseInfo['case_type_id.definition']['caseRoles'])) {
+ $caseRoles = CRM_Utils_Array::rekey($caseInfo['case_type_id.definition']['caseRoles'], 'name');
+ }
+ }
$values = array();
$query = '
- SELECT cc.display_name as name, cc.sort_name as sort_name, cc.id, crt.label_b_a as role, ce.email
+ SELECT cc.display_name as name, cc.sort_name as sort_name, cc.id, cr.relationship_type_id, crt.label_b_a as role, crt.name_b_a, ce.email
FROM civicrm_relationship cr
LEFT JOIN civicrm_relationship_type crt
ON crt.id = cr.relationship_type_id
@@ -1229,17 +1240,25 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
$dao = CRM_Core_DAO::executeQuery($query, $params);
while ($dao->fetch()) {
- if ($skipDetails) {
+ if (!$includeDetails) {
$values[$dao->id] = 1;
}
else {
- $values[] = array(
+ $details = array(
'contact_id' => $dao->id,
'display_name' => $dao->name,
'sort_name' => $dao->sort_name,
+ 'relationship_type_id' => $dao->relationship_type_id,
'role' => $dao->role,
'email' => $dao->email,
);
+ // Add more info about the role (creator, manager)
+ $role = CRM_Utils_Array::value($dao->name_b_a, $caseRoles);
+ if ($role) {
+ unset($role['name']);
+ $details += $role;
+ }
+ $values[] = $details;
}
}
$dao->free();
@@ -1465,7 +1484,7 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
// TODO: May want to replace this with a call to getRelatedAndGlobalContacts() when this feature is revisited.
// (Or for efficiency call the global one outside the loop and then union with this each time.)
- $contactDetails = self::getRelatedContacts($caseId, TRUE);
+ $contactDetails = self::getRelatedContacts($caseId, FALSE);
if (!empty($contactDetails[$result['from']['id']])) {
$params = array();
diff --git a/civicrm/CRM/Case/DAO/Case.php b/civicrm/CRM/Case/DAO/Case.php
index f8bea69025..a028dd01a2 100644
--- a/civicrm/CRM/Case/DAO/Case.php
+++ b/civicrm/CRM/Case/DAO/Case.php
@@ -30,7 +30,7 @@
*
* Generated from xml/schema/CRM/Case/Case.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:44b646374975b3c38e6619c07369162c)
+ * (GenCodeChecksum:4e1de0ce877b15b7ab3f394dad97c5ac)
*/
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Utils/Type.php';
@@ -146,6 +146,7 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO {
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Case Type') ,
'description' => 'FK to civicrm_case_type.id',
+ 'required' => true,
'import' => true,
'where' => 'civicrm_case.case_type_id',
'headerPattern' => '',
diff --git a/civicrm/CRM/Contact/BAO/Contact.php b/civicrm/CRM/Contact/BAO/Contact.php
index e1f299cc63..ff9301f1fd 100644
--- a/civicrm/CRM/Contact/BAO/Contact.php
+++ b/civicrm/CRM/Contact/BAO/Contact.php
@@ -2517,6 +2517,7 @@ AND civicrm_openid.is_primary = 1";
),
);
+ // @todo This can be figured out from metadata & we can avoid the uncached query.
CRM_Core_OptionGroup::lookupValues($temp, $names, FALSE);
$values['preferred_communication_method'] = $preffComm;
@@ -2540,14 +2541,6 @@ AND civicrm_openid.is_primary = 1";
$values['age']['y'] = CRM_Utils_Array::value('years', $age);
$values['age']['m'] = CRM_Utils_Array::value('months', $age);
}
-
- list($values['birth_date']) = CRM_Utils_Date::setDateDefaults($contact->birth_date, 'birth');
- $values['birth_date_display'] = $contact->birth_date;
- }
-
- if ($contact->deceased_date) {
- list($values['deceased_date']) = CRM_Utils_Date::setDateDefaults($contact->deceased_date, 'birth');
- $values['deceased_date_display'] = $contact->deceased_date;
}
$contact->contact_id = $contact->id;
@@ -3378,8 +3371,8 @@ LEFT JOIN civicrm_address add2 ON ( add1.master_id = add2.id )
* Ensures that is_primary gets assigned to another object if available
* Also calls pre/post hooks
*
- * @var object $type
- * @var int $id
+ * @param string $type
+ * @param int $id
* @return bool
*/
public static function deleteObjectWithPrimary($type, $id) {
diff --git a/civicrm/CRM/Contact/BAO/Contact/Permission.php b/civicrm/CRM/Contact/BAO/Contact/Permission.php
index a37e40e7f8..73c379e0df 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Permission.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Permission.php
@@ -221,7 +221,7 @@ WHERE contact_a.id = %1 AND $permission
// run a query to see if the cache is filled
$sql = "
-SELECT count(id)
+SELECT count(*)
FROM civicrm_acl_contact_cache
WHERE user_id = %1
AND $operationClause
diff --git a/civicrm/CRM/Contact/BAO/ContactType.php b/civicrm/CRM/Contact/BAO/ContactType.php
index a73acc4ef6..2efb377464 100644
--- a/civicrm/CRM/Contact/BAO/ContactType.php
+++ b/civicrm/CRM/Contact/BAO/ContactType.php
@@ -842,7 +842,7 @@ LIMIT 1";
$customSet = $subTypeClause = array();
foreach ($subtypeSet as $subtype) {
$subtype = CRM_Utils_Type::escape($subtype, 'String');
- $subType = CRM_Core_DAO::VALUE_SEPARATOR . $subtype . CRM_Core_DAO::VALUE_SEPARATOR;
+ $subtype = CRM_Core_DAO::VALUE_SEPARATOR . $subtype . CRM_Core_DAO::VALUE_SEPARATOR;
$subTypeClause[] = "extends_entity_column_value LIKE '%{$subtype}%' ";
}
$query = "SELECT table_name
diff --git a/civicrm/CRM/Contact/BAO/Group.php b/civicrm/CRM/Contact/BAO/Group.php
index aab9bc9cd9..c58b9ade63 100644
--- a/civicrm/CRM/Contact/BAO/Group.php
+++ b/civicrm/CRM/Contact/BAO/Group.php
@@ -1019,7 +1019,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
}
// Exclude deleted contacts
$where .= " and c.id = g.contact_id AND c.is_deleted = 0";
- $dao = CRM_Core_DAO::executeQuery("SELECT g.group_id, COUNT(g.id) as `count` FROM $table g, civicrm_contact c WHERE $where GROUP BY g.group_id");
+ $dao = CRM_Core_DAO::executeQuery("SELECT g.group_id, COUNT(*) as `count` FROM $table g, civicrm_contact c WHERE $where GROUP BY g.group_id");
while ($dao->fetch()) {
$values[$dao->group_id]['count'] = $dao->count;
}
diff --git a/civicrm/CRM/Contact/BAO/Query.php b/civicrm/CRM/Contact/BAO/Query.php
index e905154411..764f57325b 100644
--- a/civicrm/CRM/Contact/BAO/Query.php
+++ b/civicrm/CRM/Contact/BAO/Query.php
@@ -514,7 +514,7 @@ class CRM_Contact_BAO_Query {
CRM_Financial_BAO_FinancialType::buildPermissionedClause($this->_whereClause, $component);
}
- $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode);
+ $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode, $apiEntity);
$this->_simpleFromClause = self::fromClause($this->_whereTables, NULL, NULL, $this->_primaryLocation, $this->_mode);
$this->openedSearchPanes(TRUE);
@@ -653,8 +653,7 @@ class CRM_Contact_BAO_Query {
if (
(substr($name, 0, 12) == 'participant_') ||
(substr($name, 0, 7) == 'pledge_') ||
- (substr($name, 0, 5) == 'case_') ||
- (substr($name, 0, 8) == 'payment_')
+ (substr($name, 0, 5) == 'case_')
) {
continue;
}
@@ -2274,8 +2273,7 @@ class CRM_Contact_BAO_Query {
}
else {
if ($tableName == 'civicrm_contact') {
- // LOWER roughly translates to 'hurt my database without deriving any benefit' See CRM-19811.
- $fieldName = "LOWER(contact_a.{$fieldName})";
+ $fieldName = "contact_a.{$fieldName}";
}
else {
if ($op != 'IN' && !is_numeric($value) && !is_array($value)) {
@@ -2510,11 +2508,12 @@ class CRM_Contact_BAO_Query {
*
* @param bool $primaryLocation
* @param int $mode
+ * @param string|NULL $apiEntity
*
* @return string
* the from clause
*/
- public static function fromClause(&$tables, $inner = NULL, $right = NULL, $primaryLocation = TRUE, $mode = 1) {
+ public static function fromClause(&$tables, $inner = NULL, $right = NULL, $primaryLocation = TRUE, $mode = 1, $apiEntity = NULL) {
$from = ' FROM civicrm_contact contact_a';
if (empty($tables)) {
@@ -2605,27 +2604,29 @@ class CRM_Contact_BAO_Query {
}
continue;
}
+ $searchPrimary = '';
+ if (Civi::settings()->get('searchPrimaryDetailsOnly') || $apiEntity) {
+ $searchPrimary = "AND {$name}.is_primary = 1";
+ }
switch ($name) {
case 'civicrm_address':
- if ($primaryLocation) {
- $from .= " $side JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id AND civicrm_address.is_primary = 1 )";
- }
- else {
- //CRM-14263 further handling of address joins further down...
- $from .= " $side JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id ) ";
+ //CRM-14263 further handling of address joins further down...
+ if (!$primaryLocation) {
+ $searchPrimary = '';
}
+ $from .= " $side JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id {$searchPrimary} )";
continue;
case 'civicrm_phone':
- $from .= " $side JOIN civicrm_phone ON (contact_a.id = civicrm_phone.contact_id AND civicrm_phone.is_primary = 1) ";
+ $from .= " $side JOIN civicrm_phone ON (contact_a.id = civicrm_phone.contact_id {$searchPrimary}) ";
continue;
case 'civicrm_email':
- $from .= " $side JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_email.is_primary = 1) ";
+ $from .= " $side JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id {$searchPrimary})";
continue;
case 'civicrm_im':
- $from .= " $side JOIN civicrm_im ON (contact_a.id = civicrm_im.contact_id AND civicrm_im.is_primary = 1) ";
+ $from .= " $side JOIN civicrm_im ON (contact_a.id = civicrm_im.contact_id {$searchPrimary}) ";
continue;
case 'im_provider':
@@ -2635,7 +2636,7 @@ class CRM_Contact_BAO_Query {
continue;
case 'civicrm_openid':
- $from .= " $side JOIN civicrm_openid ON ( civicrm_openid.contact_id = contact_a.id AND civicrm_openid.is_primary = 1 )";
+ $from .= " $side JOIN civicrm_openid ON ( civicrm_openid.contact_id = contact_a.id {$searchPrimary} )";
continue;
case 'civicrm_worldregion':
@@ -2974,7 +2975,7 @@ class CRM_Contact_BAO_Query {
$gcTable = ($op == '!=') ? 'cgc' : $gcTable;
$childClause = " OR {$gcTable}.group_id IN (" . implode(',', $childGroupIds) . ") ";
}
- $groupClause[] = sprintf($clause, $childClause);
+ $groupClause[] = '(' . sprintf($clause, $childClause) . ')';
}
//CRM-19589: contact(s) removed from a Smart Group, resides in civicrm_group_contact table
@@ -2983,7 +2984,7 @@ class CRM_Contact_BAO_Query {
}
$and = ($op == 'IS NULL') ? ' AND ' : ' OR ';
- $this->_where[$grouping][] = implode($and, $groupClause);
+ $this->_where[$grouping][] = ' ( ' . implode($and, $groupClause) . ' ) ';
list($qillop, $qillVal) = CRM_Contact_BAO_Query::buildQillForFieldValue('CRM_Contact_DAO_Group', 'id', $value, $op);
$this->_qill[$grouping][] = ts("Group(s) %1 %2", array(1 => $qillop, 2 => $qillVal));
@@ -5851,7 +5852,7 @@ AND displayRelType.is_active = 1
$dao->$idColumn = $val;
if ($key == 'state_province_name') {
- $dao->{$value['pseudoField']} = $dao->$key = CRM_Core_PseudoConstant::stateProvinceAbbreviation($val);
+ $dao->{$value['pseudoField']} = $dao->$key = CRM_Core_PseudoConstant::stateProvince($val);
}
else {
$dao->{$value['pseudoField']} = $dao->$key = CRM_Core_PseudoConstant::getLabel($baoName, $value['pseudoField'], $val);
@@ -6203,10 +6204,17 @@ AND displayRelType.is_active = 1
$order = trim(str_replace('ORDER BY', '', $order));
// hack for order clause
- $fieldOrder = explode(' ', $order);
- $field = $fieldOrder[0];
+ if (!empty($orderByArray)) {
+ $order = implode(', ', $orderByArray);
+ }
+ else {
+ $orderByArray = explode(',', $order);
+ }
+ foreach ($orderByArray as $orderByClause) {
+ $orderByClauseParts = explode(' ', trim($orderByClause));
+ $field = $orderByClauseParts[0];
+ $direction = isset($orderByClauseParts[1]) ? $orderByClauseParts[1] : 'asc';
- if ($field) {
switch ($field) {
case 'city':
case 'postal_code':
@@ -6229,25 +6237,47 @@ AND displayRelType.is_active = 1
break;
default:
- //CRM-12565 add "`" around $field if it is a pseudo constant
- foreach ($this->_pseudoConstantsSelect as $key => $value) {
- if (!empty($value['element']) && $value['element'] == $field) {
+ foreach ($this->_pseudoConstantsSelect as $key => $pseudoConstantMetadata) {
+ // By replacing the join to the option value table with the mysql construct
+ // ORDER BY field('contribution_status_id', 2,1,4)
+ // we can remove a join. In the case of the option value join it is
+ /// a join known to cause slow queries.
+ // @todo cover other pseudoconstant types. Limited to option group ones in the
+ // first instance for scope reasons. They require slightly different handling as the column (label)
+ // is not declared for them.
+ // @todo so far only integer fields are being handled. If we add string fields we need to look at
+ // escaping.
+ if (isset($pseudoConstantMetadata['pseudoconstant'])
+ && isset($pseudoConstantMetadata['pseudoconstant']['optionGroupName'])
+ && $field === CRM_Utils_Array::value('optionGroupName', $pseudoConstantMetadata['pseudoconstant'])
+ ) {
+ $sortedOptions = $pseudoConstantMetadata['bao']::buildOptions($pseudoConstantMetadata['pseudoField'], NULL, array(
+ 'orderColumn' => 'label',
+ ));
+ $order = str_replace("$field $direction", "field({$pseudoConstantMetadata['pseudoField']}," . implode(',', array_keys($sortedOptions)) . ") $direction", $order);
+ }
+ //CRM-12565 add "`" around $field if it is a pseudo constant
+ // This appears to be for 'special' fields like locations with appended numbers or hyphens .. maybe.
+ if (!empty($pseudoConstantMetadata['element']) && $pseudoConstantMetadata['element'] == $field) {
$order = str_replace($field, "`{$field}`", $order);
}
}
}
- $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode);
- $this->_simpleFromClause = self::fromClause($this->_whereTables, NULL, NULL, $this->_primaryLocation, $this->_mode);
}
+ $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode);
+ $this->_simpleFromClause = self::fromClause($this->_whereTables, NULL, NULL, $this->_primaryLocation, $this->_mode);
+
// The above code relies on crazy brittle string manipulation of a peculiarly-encoded ORDER BY
// clause. But this magic helper which forgivingly reescapes ORDER BY.
// Note: $sortByChar implies that $order was hard-coded/trusted, so it can do funky things.
- if ($order && !$sortByChar) {
+ if ($sortByChar) {
+ return array(' ORDER BY ' . $order, $additionalFromClause);
+ }
+ if ($order) {
$order = CRM_Utils_Type::escape($order, 'MysqlOrderBy');
return array(' ORDER BY ' . $order, $additionalFromClause);
}
- return array($order, $additionalFromClause);
}
/**
@@ -6312,10 +6342,6 @@ AND displayRelType.is_active = 1
if (!isset($field['pseudoconstant']['optionGroupName'])) {
return FALSE;
}
- if (empty($field['bao']) || $field['bao'] != 'CRM_Contact_BAO_Contact') {
- // For now....
- return FALSE;
- }
if (CRM_Utils_Array::value($field['pseudoconstant']['optionGroupName'], $this->_returnProperties)) {
return TRUE;
diff --git a/civicrm/CRM/Contact/Form/DedupeRules.php b/civicrm/CRM/Contact/Form/DedupeRules.php
index a27a06b5c8..82e2faf15a 100644
--- a/civicrm/CRM/Contact/Form/DedupeRules.php
+++ b/civicrm/CRM/Contact/Form/DedupeRules.php
@@ -155,6 +155,9 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form {
break;
}
}
+ if (empty($fields['threshold'])) {
+ $errors['threshold'] = ts('Threshold weight cannot be empty or zero.');
+ }
if (!$fieldSelected) {
$errors['_qf_default'] = ts('Please select at least one field.');
diff --git a/civicrm/CRM/Contact/Form/Edit/Demographics.php b/civicrm/CRM/Contact/Form/Edit/Demographics.php
index d01495d597..e96acc7e22 100644
--- a/civicrm/CRM/Contact/Form/Edit/Demographics.php
+++ b/civicrm/CRM/Contact/Form/Edit/Demographics.php
@@ -45,10 +45,10 @@ class CRM_Contact_Form_Edit_Demographics {
public static function buildQuickForm(&$form) {
$form->addField('gender_id', array('entity' => 'contact', 'type' => 'Radio', 'allowClear' => TRUE));
- $form->addField('birth_date', array('entity' => 'contact', 'formatType' => 'birth'));
+ $form->addField('birth_date', array('entity' => 'contact'), FALSE, FALSE);
$form->addField('is_deceased', array('entity' => 'contact', 'label' => ts('Contact is Deceased'), 'onclick' => "showDeceasedDate()"));
- $form->addField('deceased_date', array('entity' => 'contact', 'formatType' => 'birth'));
+ $form->addField('deceased_date', array('entity' => 'contact'), FALSE, FALSE);
}
/**
diff --git a/civicrm/CRM/Contact/Form/Merge.php b/civicrm/CRM/Contact/Form/Merge.php
index 9445834f0a..a026f35d32 100644
--- a/civicrm/CRM/Contact/Form/Merge.php
+++ b/civicrm/CRM/Contact/Form/Merge.php
@@ -64,171 +64,166 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
var $_qfZeroBug = 'e8cddb72-a257-11dc-b9cc-0016d3330ee9';
public function preProcess() {
- if (!CRM_Core_Permission::check('merge duplicate contacts')) {
- CRM_Core_Error::fatal(ts('You do not have access to this page'));
- }
-
- $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
- $oid = CRM_Utils_Request::retrieve('oid', 'Positive', $this, TRUE);
- $flip = CRM_Utils_Request::retrieve('flip', 'Positive', $this, FALSE);
-
- $this->_rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE);
- $this->_gid = $gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this, FALSE);
- $this->_mergeId = CRM_Utils_Request::retrieve('mergeId', 'Positive', $this, FALSE);
- $this->limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this, FALSE);
- $urlParams = "reset=1&rgid={$this->_rgid}&gid={$this->_gid}&limit=" . $this->limit;
+ try {
- $this->bounceIfInvalid($cid, $oid);
+ $this->_cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
+ $this->_oid = CRM_Utils_Request::retrieve('oid', 'Positive', $this, TRUE);
+ $flip = CRM_Utils_Request::retrieve('flip', 'Positive', $this, FALSE);
- $this->_contactType = civicrm_api3('Contact', 'getvalue', array('id' => $cid, 'return' => 'contact_type'));
+ $this->_rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE);
+ $this->_gid = $gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this, FALSE);
+ $this->_mergeId = CRM_Utils_Request::retrieve('mergeId', 'Positive', $this, FALSE);
+ $this->limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this, FALSE);
+ $urlParams = "reset=1&rgid={$this->_rgid}&gid={$this->_gid}&limit=" . $this->limit;
- $browseUrl = CRM_Utils_System::url('civicrm/contact/dedupefind', $urlParams . '&action=browse');
+ $this->bounceIfInvalid($this->_cid, $this->_oid);
- if (!$this->_rgid) {
- // Unset browse URL as we have come from the search screen.
- $browseUrl = '';
- $this->_rgid = civicrm_api3('RuleGroup', 'getvalue', array(
- 'contact_type' => $this->_contactType,
- 'used' => 'Supervised',
- 'return' => 'id',
+ $this->_contactType = civicrm_api3('Contact', 'getvalue', array(
+ 'id' => $this->_cid,
+ 'return' => 'contact_type',
));
- }
- $this->assign('browseUrl', $browseUrl);
- if ($browseUrl) {
- CRM_Core_Session::singleton()->pushUserContext($browseUrl);
- }
- $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid);
+ $browseUrl = CRM_Utils_System::url('civicrm/contact/dedupefind', $urlParams . '&action=browse');
- $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
- $where = "de.id IS NULL";
+ if (!$this->_rgid) {
+ // Unset browse URL as we have come from the search screen.
+ $browseUrl = '';
+ $this->_rgid = civicrm_api3('RuleGroup', 'getvalue', array(
+ 'contact_type' => $this->_contactType,
+ 'used' => 'Supervised',
+ 'return' => 'id',
+ ));
+ }
+ $this->assign('browseUrl', $browseUrl);
+ if ($browseUrl) {
+ CRM_Core_Session::singleton()->pushUserContext($browseUrl);
+ }
- $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, $cid, $oid, $this->_mergeId, $join, $where, $flip);
+ $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid);
- // get user info of main contact.
- $config = CRM_Core_Config::singleton();
- $config->doNotResetCache = 1;
+ $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
+ $where = "de.id IS NULL";
- $viewUser = CRM_Core_Permission::check('access user profiles');
- $mainUfId = CRM_Core_BAO_UFMatch::getUFId($cid);
- $mainUser = NULL;
- if ($mainUfId) {
- // d6 compatible
- if ($config->userSystem->is_drupal == '1') {
- $mainUser = user_load($mainUfId);
- }
- elseif ($config->userFramework == 'Joomla') {
- $mainUser = JFactory::getUser($mainUfId);
- }
+ $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, $this->_cid, $this->_oid, $this->_mergeId, $join, $where, $flip);
- $this->assign('mainUfId', $mainUfId);
- $this->assign('mainUfName', $mainUser ? $mainUser->name : NULL);
- }
+ // get user info of main contact.
+ $config = CRM_Core_Config::singleton();
+ $config->doNotResetCache = 1;
- $flipUrl = CRM_Utils_System::url('civicrm/contact/merge',
- "reset=1&action=update&cid={$oid}&oid={$cid}&rgid={$this->_rgid}&gid={$gid}"
- );
- if (!$flip) {
- $flipUrl .= '&flip=1';
- }
- $this->assign('flip', $flipUrl);
-
- $this->prev = $this->next = NULL;
- foreach (array(
- 'prev',
- 'next',
- ) as $position) {
- if (!empty($pos[$position])) {
- if ($pos[$position]['id1'] && $pos[$position]['id2']) {
- $urlParams .= "&cid={$pos[$position]['id1']}&oid={$pos[$position]['id2']}&mergeId={$pos[$position]['mergeId']}&action=update";
- $this->$position = CRM_Utils_System::url('civicrm/contact/merge', $urlParams);
- $this->assign($position, $this->$position);
+ $mainUfId = CRM_Core_BAO_UFMatch::getUFId($this->_cid);
+ $mainUser = NULL;
+ if ($mainUfId) {
+ // d6 compatible
+ if ($config->userSystem->is_drupal == '1') {
+ $mainUser = user_load($mainUfId);
+ }
+ elseif ($config->userFramework == 'Joomla') {
+ $mainUser = JFactory::getUser($mainUfId);
}
- }
- }
- // get user info of other contact.
- $otherUfId = CRM_Core_BAO_UFMatch::getUFId($oid);
- $otherUser = NULL;
+ $this->assign('mainUfId', $mainUfId);
+ $this->assign('mainUfName', $mainUser ? $mainUser->name : NULL);
+ }
- if ($otherUfId) {
- // d6 compatible
- if ($config->userSystem->is_drupal == '1') {
- $otherUser = user_load($otherUfId);
+ $flipUrl = CRM_Utils_System::url('civicrm/contact/merge',
+ "reset=1&action=update&cid={$this->_oid}&oid={$this->_cid}&rgid={$this->_rgid}&gid={$gid}"
+ );
+ if (!$flip) {
+ $flipUrl .= '&flip=1';
}
- elseif ($config->userFramework == 'Joomla') {
- $otherUser = JFactory::getUser($otherUfId);
+ $this->assign('flip', $flipUrl);
+
+ $this->prev = $this->next = NULL;
+ foreach (array(
+ 'prev',
+ 'next',
+ ) as $position) {
+ if (!empty($pos[$position])) {
+ if ($pos[$position]['id1'] && $pos[$position]['id2']) {
+ $urlParams .= "&cid={$pos[$position]['id1']}&oid={$pos[$position]['id2']}&mergeId={$pos[$position]['mergeId']}&action=update";
+ $this->$position = CRM_Utils_System::url('civicrm/contact/merge', $urlParams);
+ $this->assign($position, $this->$position);
+ }
+ }
}
- $this->assign('otherUfId', $otherUfId);
- $this->assign('otherUfName', $otherUser ? $otherUser->name : NULL);
- }
-
- $cmsUser = ($mainUfId && $otherUfId) ? TRUE : FALSE;
- $this->assign('user', $cmsUser);
-
- $session = CRM_Core_Session::singleton();
+ // get user info of other contact.
+ $otherUfId = CRM_Core_BAO_UFMatch::getUFId($this->_oid);
+ $otherUser = NULL;
- $rowsElementsAndInfo = CRM_Dedupe_Merger::getRowsElementsAndInfo($cid, $oid);
- $main = $this->_mainDetails = $rowsElementsAndInfo['main_details'];
- $other = $this->_otherDetails = $rowsElementsAndInfo['other_details'];
-
- if ($main['contact_id'] != $cid) {
- CRM_Core_Error::fatal(ts('The main contact record does not exist'));
- }
+ if ($otherUfId) {
+ // d6 compatible
+ if ($config->userSystem->is_drupal == '1') {
+ $otherUser = user_load($otherUfId);
+ }
+ elseif ($config->userFramework == 'Joomla') {
+ $otherUser = JFactory::getUser($otherUfId);
+ }
- if ($other['contact_id'] != $oid) {
- CRM_Core_Error::fatal(ts('The other contact record does not exist'));
- }
+ $this->assign('otherUfId', $otherUfId);
+ $this->assign('otherUfName', $otherUser ? $otherUser->name : NULL);
+ }
- $this->assign('contact_type', $main['contact_type']);
- $this->assign('main_name', $main['display_name']);
- $this->assign('other_name', $other['display_name']);
- $this->assign('main_cid', $main['contact_id']);
- $this->assign('other_cid', $other['contact_id']);
- $this->assign('rgid', $this->_rgid);
-
- $this->_cid = $cid;
- $this->_oid = $oid;
-
- $this->addElement('checkbox', 'toggleSelect', NULL, NULL, array('class' => 'select-rows'));
-
- $this->assign('mainLocBlock', json_encode($rowsElementsAndInfo['main_details']['location_blocks']));
- $this->assign('locationBlockInfo', json_encode(CRM_Dedupe_Merger::getLocationBlockInfo()));
- $this->assign('rows', $rowsElementsAndInfo['rows']);
-
- // add elements
- foreach ($rowsElementsAndInfo['elements'] as $element) {
- // We could push this down to the getRowsElementsAndInfo function but it's
- // already so overloaded - let's start moving towards doing form-things
- // on the form.
- if (substr($element[1], 0, 13) === 'move_location') {
- $element[4] = array_merge(
- (array) CRM_Utils_Array::value(4, $element, array()),
- array('data-location' => substr($element[1], 14), 'data-is_location' => TRUE));
+ $cmsUser = ($mainUfId && $otherUfId) ? TRUE : FALSE;
+ $this->assign('user', $cmsUser);
+
+ $rowsElementsAndInfo = CRM_Dedupe_Merger::getRowsElementsAndInfo($this->_cid, $this->_oid);
+ $main = $this->_mainDetails = $rowsElementsAndInfo['main_details'];
+ $other = $this->_otherDetails = $rowsElementsAndInfo['other_details'];
+
+ $this->assign('contact_type', $main['contact_type']);
+ $this->assign('main_name', $main['display_name']);
+ $this->assign('other_name', $other['display_name']);
+ $this->assign('main_cid', $main['contact_id']);
+ $this->assign('other_cid', $other['contact_id']);
+ $this->assign('rgid', $this->_rgid);
+
+ $this->addElement('checkbox', 'toggleSelect', NULL, NULL, array('class' => 'select-rows'));
+
+ $this->assign('mainLocBlock', json_encode($rowsElementsAndInfo['main_details']['location_blocks']));
+ $this->assign('locationBlockInfo', json_encode(CRM_Dedupe_Merger::getLocationBlockInfo()));
+ $this->assign('rows', $rowsElementsAndInfo['rows']);
+
+ // add elements
+ foreach ($rowsElementsAndInfo['elements'] as $element) {
+ // We could push this down to the getRowsElementsAndInfo function but it's
+ // already so overloaded - let's start moving towards doing form-things
+ // on the form.
+ if (substr($element[1], 0, 13) === 'move_location') {
+ $element[4] = array_merge(
+ (array) CRM_Utils_Array::value(4, $element, array()),
+ array(
+ 'data-location' => substr($element[1], 14),
+ 'data-is_location' => TRUE,
+ ));
+ }
+ if (substr($element[1], 0, 15) === 'location_blocks') {
+ // @todo We could add some data elements here to make jquery manipulation more straight-forward
+ // @todo consider enabling if it is an add & defaulting to true.
+ $element[4] = array_merge((array) CRM_Utils_Array::value(4, $element, array()), array('disabled' => TRUE));
+ }
+ $this->addElement($element[0],
+ $element[1],
+ array_key_exists('2', $element) ? $element[2] : NULL,
+ array_key_exists('3', $element) ? $element[3] : NULL,
+ array_key_exists('4', $element) ? $element[4] : NULL,
+ array_key_exists('5', $element) ? $element[5] : NULL
+ );
}
- if (substr($element[1], 0, 15) === 'location_blocks') {
- // @todo We could add some data elements here to make jquery manipulation more straight-forward
- // @todo consider enabling if it is an add & defaulting to true.
- $element[4] = array_merge((array) CRM_Utils_Array::value(4, $element, array()), array('disabled' => TRUE));
+
+ // add related table elements
+ foreach ($rowsElementsAndInfo['rel_table_elements'] as $relTableElement) {
+ $element = $this->addElement($relTableElement[0], $relTableElement[1]);
+ $element->setChecked(TRUE);
}
- $this->addElement($element[0],
- $element[1],
- array_key_exists('2', $element) ? $element[2] : NULL,
- array_key_exists('3', $element) ? $element[3] : NULL,
- array_key_exists('4', $element) ? $element[4] : NULL,
- array_key_exists('5', $element) ? $element[5] : NULL
- );
- }
- // add related table elements
- foreach ($rowsElementsAndInfo['rel_table_elements'] as $relTableElement) {
- $element = $this->addElement($relTableElement[0], $relTableElement[1]);
- $element->setChecked(TRUE);
+ $this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
+ $this->assign('userContextURL', CRM_Core_Session::singleton()
+ ->readUserContext());
+ }
+ catch (CRM_Core_Exception $e) {
+ CRM_Core_Error::statusBounce(ts($e->getMessage()));
}
-
- $this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
- $this->assign('userContextURL', $session->readUserContext());
}
public function addRules() {
diff --git a/civicrm/CRM/Contact/Form/Search/Criteria.php b/civicrm/CRM/Contact/Form/Search/Criteria.php
index b658ee6e6d..d0f892cb6b 100644
--- a/civicrm/CRM/Contact/Form/Search/Criteria.php
+++ b/civicrm/CRM/Contact/Form/Search/Criteria.php
@@ -297,6 +297,8 @@ class CRM_Contact_Form_Search_Criteria {
$elements = array(
'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL),
+ 'supplemental_address_1' => array(ts('Supplemental Address 1'), $attributes['supplemental_address_1'], NULL, NULL),
+ 'supplemental_address_2' => array(ts('Supplemental Address 2'), $attributes['supplemental_address_2'], NULL, NULL),
'city' => array(ts('City'), $attributes['city'], NULL, NULL),
'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL),
'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE),
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
index 8fa70eead1..f52c1bde27 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
@@ -224,6 +224,10 @@ CREATE TEMPORARY TABLE {$this->_entityIDTableName} (
) ENGINE=HEAP DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
";
CRM_Core_DAO::executeQuery($sql);
+
+ if (!empty($this->_formValues['is_unit_test'])) {
+ $this->_tableNameForTest = $this->_tableName;
+ }
}
public function fillTable() {
@@ -259,7 +263,7 @@ CREATE TEMPORARY TABLE {$this->_entityIDTableName} (
$sql = "
DELETE t.*
FROM {$this->_tableName} t
-WHERE NOT EXISTS ( SELECT c.id
+WHERE NOT EXISTS ( SELECT c.contact_id
FROM civicrm_acl_contact_cache c
WHERE c.user_id = %1 AND t.contact_id = c.contact_id )
";
@@ -269,7 +273,7 @@ WHERE NOT EXISTS ( SELECT c.id
DELETE t.*
FROM {$this->_tableName} t
WHERE t.table_name = 'Activity' AND
- NOT EXISTS ( SELECT c.id
+ NOT EXISTS ( SELECT c.contact_id
FROM civicrm_acl_contact_cache c
WHERE c.user_id = %1 AND ( t.target_contact_id = c.contact_id OR t.target_contact_id IS NULL ) )
";
@@ -279,7 +283,7 @@ WHERE t.table_name = 'Activity' AND
DELETE t.*
FROM {$this->_tableName} t
WHERE t.table_name = 'Activity' AND
- NOT EXISTS ( SELECT c.id
+ NOT EXISTS ( SELECT c.contact_id
FROM civicrm_acl_contact_cache c
WHERE c.user_id = %1 AND ( t.assignee_contact_id = c.contact_id OR t.assignee_contact_id IS NULL ) )
";
diff --git a/civicrm/CRM/Contact/Page/Inline/Demographics.php b/civicrm/CRM/Contact/Page/Inline/Demographics.php
index 33a43adbb4..373ff40188 100644
--- a/civicrm/CRM/Contact/Page/Inline/Demographics.php
+++ b/civicrm/CRM/Contact/Page/Inline/Demographics.php
@@ -54,13 +54,11 @@ class CRM_Contact_Page_Inline_Demographics extends CRM_Core_Page {
$gender = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
$defaults['gender_display'] = $gender[CRM_Utils_Array::value('gender_id', $defaults)];
}
+ $this->assignFieldMetadataToTemplate('Contact');
$this->assign('contactId', $contactId);
$this->assign($defaults);
- //for birthdate format with respect to birth format set
- $this->assign('birthDateViewFormat', CRM_Utils_Array::value('qfMapping', CRM_Utils_Date::checkBirthDateFormat()));
-
// check logged in user permission
CRM_Contact_Page_View::checkUserPermission($this, $contactId);
diff --git a/civicrm/CRM/Contact/Page/View/Summary.php b/civicrm/CRM/Contact/Page/View/Summary.php
index 7a633d1e49..ef4b9c6dfd 100644
--- a/civicrm/CRM/Contact/Page/View/Summary.php
+++ b/civicrm/CRM/Contact/Page/View/Summary.php
@@ -119,8 +119,6 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
CRM_Core_Resources::singleton()
->addScriptFile('civicrm', 'templates/CRM/Contact/Page/View/Summary.js', 2, 'html-header')
->addStyleFile('civicrm', 'css/contactSummary.css', 2, 'html-header')
- ->addScriptFile('civicrm', 'packages/jquery/plugins/jstree/jquery.jstree.js', 0, 'html-header', FALSE)
- ->addStyleFile('civicrm', 'packages/jquery/plugins/jstree/themes/default/style.css', 0, 'html-header')
->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
->addSetting(array(
'summaryPrint' => array('mode' => $this->_print),
@@ -130,10 +128,10 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
$session = CRM_Core_Session::singleton();
$url = CRM_Utils_System::url('civicrm/contact/view', 'reset=1&cid=' . $this->_contactId);
$session->pushUserContext($url);
+ $this->assignFieldMetadataToTemplate('Contact');
$params = array();
$defaults = array();
- $ids = array();
$params['id'] = $params['contact_id'] = $this->_contactId;
$params['noRelationships'] = $params['noNotes'] = $params['noGroups'] = TRUE;
@@ -259,9 +257,6 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
$defaults['current_employer'] = $contact->organization_name;
$defaults['current_employer_id'] = $contact->employer_id;
}
-
- //for birthdate format with respect to birth format set
- $this->assign('birthDateViewFormat', CRM_Utils_Array::value('qfMapping', CRM_Utils_Date::checkBirthDateFormat()));
}
$defaults['external_identifier'] = $contact->external_identifier;
diff --git a/civicrm/CRM/Contact/Page/View/Vcard.php b/civicrm/CRM/Contact/Page/View/Vcard.php
index 100278ef2f..0a7b2cce4f 100644
--- a/civicrm/CRM/Contact/Page/View/Vcard.php
+++ b/civicrm/CRM/Contact/Page/View/Vcard.php
@@ -88,8 +88,8 @@ class CRM_Contact_Page_View_Vcard extends CRM_Contact_Page_View {
$vcard->setTitle($defaults['job_title']);
}
- if (!empty($defaults['birth_date_display'])) {
- $vcard->setBirthday(CRM_Utils_Array::value('birth_date_display', $defaults));
+ if (!empty($defaults['birth_date'])) {
+ $vcard->setBirthday(CRM_Utils_Array::value('birth_date', $defaults));
}
if (!empty($defaults['home_URL'])) {
diff --git a/civicrm/CRM/Contact/Selector.php b/civicrm/CRM/Contact/Selector.php
index 8cb3ec84e6..9d1ceb8f69 100644
--- a/civicrm/CRM/Contact/Selector.php
+++ b/civicrm/CRM/Contact/Selector.php
@@ -488,6 +488,9 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
elseif (isset($this->_query->_fields[$prop]) && isset($this->_query->_fields[$prop]['title'])) {
$title = $this->_query->_fields[$prop]['title'];
}
+ elseif (isset($this->_query->_pseudoConstantsSelect[$prop]) && isset($this->_query->_pseudoConstantsSelect[$prop]['pseudoconstant']['optionGroupName'])) {
+ $title = CRM_Core_BAO_OptionGroup::getTitleByName($this->_query->_pseudoConstantsSelect[$prop]['pseudoconstant']['optionGroupName']);
+ }
else {
$title = '';
}
diff --git a/civicrm/CRM/Contribute/BAO/Contribution.php b/civicrm/CRM/Contribute/BAO/Contribution.php
index ab6c479f01..60b197bd78 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -780,6 +780,15 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
return self::$_importableFields;
}
+ /**
+ * Get exportable fields with pseudoconstants rendered as an extra field.
+ */
+ public static function getExportableFieldsWithPseudoConstants() {
+ $fields = self::exportableFields();
+ CRM_Core_DAO::appendPseudoConstantsToFields($fields);
+ return $fields;
+ }
+
/**
* Combine all the exportable fields from the lower level objects.
*
@@ -799,14 +808,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
$expFieldsContrib = CRM_Contribute_DAO_ContributionProduct::export();
$typeField = CRM_Financial_DAO_FinancialType::export();
$financialAccount = CRM_Financial_DAO_FinancialAccount::export();
- $optionField = CRM_Core_OptionValue::getFields($mode = 'contribute');
- $contributionStatus = array(
- 'contribution_status' => array(
- 'title' => ts('Contribution Status'),
- 'name' => 'contribution_status',
- 'data_type' => CRM_Utils_Type::T_STRING,
- ),
- );
$contributionPage = array(
'contribution_page' => array(
@@ -883,7 +884,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
),
);
- $fields = array_merge($impFields, $typeField, $contributionStatus, $contributionPage, $optionField, $expFieldProduct,
+ $fields = array_merge($impFields, $typeField, $contributionPage, $expFieldProduct,
$expFieldsContrib, $contributionNote, $extraFields, $softCreditFields, $financialAccount, $premiums, $campaignTitle,
CRM_Core_BAO_CustomField::getFieldsForImport('Contribution', FALSE, FALSE, FALSE, $checkPermission)
);
@@ -1137,6 +1138,8 @@ LEFT JOIN civicrm_line_item i ON ( i.contribution_id = c.id AND i.entity_table
*/
public static function getContributionFields($addExtraFields = TRUE) {
$contributionFields = CRM_Contribute_DAO_Contribution::export();
+ // @todo remove this - this line was added because payment_instrument_id was not
+ // set to exportable - but now it is.
$contributionFields = array_merge($contributionFields, CRM_Core_OptionValue::getFields($mode = 'contribute'));
if ($addExtraFields) {
@@ -2319,23 +2322,12 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
$ids['contributionType'] = $this->financial_type_id;
$ids['financialType'] = $this->financial_type_id;
-
- $entities = array(
- 'contact' => 'CRM_Contact_BAO_Contact',
- 'contributionRecur' => 'CRM_Contribute_BAO_ContributionRecur',
- 'contributionType' => 'CRM_Financial_BAO_FinancialType',
- 'financialType' => 'CRM_Financial_BAO_FinancialType',
- );
- foreach ($entities as $entity => $bao) {
- if (!empty($ids[$entity])) {
- $this->_relatedObjects[$entity] = new $bao();
- $this->_relatedObjects[$entity]->id = $ids[$entity];
- if (!$this->_relatedObjects[$entity]->find(TRUE)) {
- throw new CRM_Core_Exception($entity . ' could not be loaded');
- }
- }
+ if ($this->contribution_page_id) {
+ $ids['contributionPage'] = $this->contribution_page_id;
}
+ $this->loadRelatedEntitiesByID($ids);
+
if (!empty($ids['contributionRecur']) && !$paymentProcessorID) {
$paymentProcessorID = $this->_relatedObjects['contributionRecur']->payment_processor_id;
}
@@ -2413,7 +2405,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
* @param array $values
* Any values that may have already been compiled by calling process.
* This is augmented by values 'gathered' by gatherMessageValues
- * @param bool $recur
* @param bool $returnMessageText
* Distinguishes between whether to send message or return.
* message text. We are working towards this function ALWAYS returning message text & calling
@@ -2423,7 +2414,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
* messages
* @throws Exception
*/
- public function composeMessageArray(&$input, &$ids, &$values, $recur = FALSE, $returnMessageText = TRUE) {
+ public function composeMessageArray(&$input, &$ids, &$values, $returnMessageText = TRUE) {
$this->loadRelatedObjects($input, $ids);
if (empty($this->_component)) {
@@ -2432,15 +2423,15 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
//not really sure what params might be passed in but lets merge em into values
$values = array_merge($this->_gatherMessageValues($input, $values, $ids), $values);
+ $values['is_email_receipt'] = $this->isEmailReceipt($input, $values);
if (!empty($input['receipt_date'])) {
$values['receipt_date'] = $input['receipt_date'];
}
- $template = CRM_Core_Smarty::singleton();
- $this->_assignMessageVariablesToTemplate($values, $input, $template, $recur, $returnMessageText);
+ $template = $this->_assignMessageVariablesToTemplate($values, $input, $returnMessageText);
//what does recur 'mean here - to do with payment processor return functionality but
// what is the importance
- if ($recur && !empty($this->_relatedObjects['paymentProcessor'])) {
+ if (!empty($this->contribution_recur_id) && !empty($this->_relatedObjects['paymentProcessor'])) {
$paymentObject = Civi\Payment\System::singleton()->getByProcessor($this->_relatedObjects['paymentProcessor']);
$entityID = $entity = NULL;
@@ -2497,7 +2488,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
if (!empty($input['amount'])) {
$values['totalAmount'] = $input['amount'];
}
-
+ // @todo set this in is_email_receipt, based on $this->_relatedObjects.
if ($values['event']['is_email_confirm']) {
$values['is_email_receipt'] = 1;
}
@@ -2549,7 +2540,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
$values['is_pay_later'] = 1;
}
- if ($recur && $paymentObject) {
+ if (!empty($this->contribution_recur_id) && $paymentObject) {
$url = $paymentObject->subscriptionURL($membership->id, 'membership', 'cancel');
$template->assign('cancelSubscriptionUrl', $url);
$url = $paymentObject->subscriptionURL($membership->id, 'membership', 'billing');
@@ -2610,8 +2601,14 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
$values['softContributions'] = $softContributions['soft_credit'];
}
if (isset($this->contribution_page_id)) {
+ // This is a call we want to use less, in favour of loading related objects.
$values = $this->addContributionPageValuesToValuesHeavyHandedly($values);
if ($this->contribution_page_id) {
+ // This is precautionary as there are some legacy flows, but it should really be
+ // loaded by now.
+ if (!isset($this->_relatedObjects['contributionPage'])) {
+ $this->loadRelatedEntitiesByID(array('contributionPage' => $this->contribution_page_id));
+ }
// CRM-8254 - override default currency if applicable
$config = CRM_Core_Config::singleton();
$config->defaultCurrency = CRM_Utils_Array::value(
@@ -2624,7 +2621,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
// no contribution page -probably back office
else {
// Handle re-print receipt for offline contributions (call from PDF.php - no contribution_page_id)
- $values['is_email_receipt'] = 1;
$values['title'] = 'Contribution';
}
// set lineItem for contribution
@@ -2785,13 +2781,12 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
*
* @param $values
* @param $input
- * @param CRM_Core_SMARTY $template
- * @param bool $recur
* @param bool $returnMessageText
*
* @return mixed
*/
- public function _assignMessageVariablesToTemplate(&$values, $input, &$template, $recur = FALSE, $returnMessageText = TRUE) {
+ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessageText = TRUE) {
+ $template = CRM_Core_Smarty::singleton();
$template->assign('first_name', $this->_relatedObjects['contact']->first_name);
$template->assign('last_name', $this->_relatedObjects['contact']->last_name);
$template->assign('displayName', $this->_relatedObjects['contact']->display_name);
@@ -2886,7 +2881,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
)
);
$template->assign('is_monetary', 1);
- $template->assign('is_recur', (bool) $recur);
+ $template->assign('is_recur', !empty($this->contribution_recur_id));
$template->assign('currency', $this->currency);
$template->assign('address', CRM_Utils_Address::format($input));
if (!empty($values['customGroup'])) {
@@ -3702,6 +3697,9 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
public static function buildOptions($fieldName, $context = NULL, $props = array()) {
$className = __CLASS__;
$params = array();
+ if (isset($props['orderColumn'])) {
+ $params['orderColumn'] = $props['orderColumn'];
+ }
switch ($fieldName) {
// This field is not part of this object but the api supports it
case 'payment_processor':
@@ -4534,6 +4532,8 @@ WHERE eft.financial_trxn_id IN ({$trxnId}, {$baseTrxnId['financialTrxnId']})
// 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
@@ -4693,8 +4693,6 @@ LIMIT 1;";
* @param int $contributionID
* @param array $values
* Values related to objects that have already been loaded.
- * @param bool $recur
- * Is it part of a recurring contribution.
* @param bool $returnMessageText
* Should text be returned instead of sent. This.
* is because the function is also used to generate pdfs
@@ -4703,9 +4701,8 @@ LIMIT 1;";
* @throws \CRM_Core_Exception
* @throws \CiviCRM_API3_Exception
*/
- public static function sendMail(&$input, &$ids, $contributionID, &$values, $recur = FALSE,
+ public static function sendMail(&$input, &$ids, $contributionID, &$values,
$returnMessageText = FALSE) {
- $input['is_recur'] = $recur;
$contribution = new CRM_Contribute_BAO_Contribution();
$contribution->id = $contributionID;
@@ -4717,7 +4714,7 @@ LIMIT 1;";
if (!$returnMessageText) {
list($values['receipt_from_name'], $values['receipt_from_email']) = self::generateFromEmailAndName($input, $contribution);
}
- $return = $contribution->composeMessageArray($input, $ids, $values, $recur, $returnMessageText);
+ $return = $contribution->composeMessageArray($input, $ids, $values, $returnMessageText);
// Contribution ID should really always be set. But ?
if (!$returnMessageText && (!isset($input['receipt_update']) || $input['receipt_update']) && empty($contribution->receipt_date)) {
civicrm_api3('Contribution', 'create', array('receipt_date' => 'now', 'id' => $contribution->id));
@@ -5057,7 +5054,6 @@ LIMIT 1;";
// These are the values that I believe to be useful.
'id',
'title',
- 'is_email_receipt',
'pay_later_receipt',
'pay_later_text',
'receipt_from_email',
@@ -5370,22 +5366,6 @@ LEFT JOIN civicrm_contribution on (civicrm_contribution.contact_id = civicrm_co
return $amount;
}
- /**
- * Calculate net amount.
- *
- * @param array $netAmount
- *
- * @param float $taxAmount
- *
- * @return array
- */
- public static function calculateNetAmount($netAmount, $taxAmount) {
- if ($taxAmount) {
- $netAmount -= $taxAmount;
- }
- return CRM_Utils_Money::format($netAmount, NULL, '%a');
- }
-
/**
* Retrieve Sales Tax Financial Accounts.
*
@@ -5484,4 +5464,47 @@ LEFT JOIN civicrm_contribution on (civicrm_contribution.contact_id = civicrm_co
}
}
+ /**
+ * Load entities related to the contribution into $this->_relatedObjects.
+ *
+ * @param array $ids
+ *
+ * @throws \CRM_Core_Exception
+ */
+ protected function loadRelatedEntitiesByID($ids) {
+ $entities = array(
+ 'contact' => 'CRM_Contact_BAO_Contact',
+ 'contributionRecur' => 'CRM_Contribute_BAO_ContributionRecur',
+ 'contributionType' => 'CRM_Financial_BAO_FinancialType',
+ 'financialType' => 'CRM_Financial_BAO_FinancialType',
+ 'contributionPage' => 'CRM_Contribute_BAO_ContributionPage',
+ );
+ foreach ($entities as $entity => $bao) {
+ if (!empty($ids[$entity])) {
+ $this->_relatedObjects[$entity] = new $bao();
+ $this->_relatedObjects[$entity]->id = $ids[$entity];
+ if (!$this->_relatedObjects[$entity]->find(TRUE)) {
+ throw new CRM_Core_Exception($entity . ' could not be loaded');
+ }
+ }
+ }
+ }
+
+ /**
+ * Should an email receipt be sent for this contribution when complete.
+ *
+ * @param array $input
+ *
+ * @return mixed
+ */
+ protected function isEmailReceipt($input) {
+ if (isset($input['is_email_receipt'])) {
+ return $input['is_email_receipt'];
+ }
+ if (!empty($this->_relatedObjects['contribution_page_id'])) {
+ return $this->_relatedObjects['contribution_page_id']->is_email_receipt;
+ }
+ return TRUE;
+ }
+
}
diff --git a/civicrm/CRM/Contribute/BAO/Query.php b/civicrm/CRM/Contribute/BAO/Query.php
index f7e4f5d06c..e7153b4eca 100644
--- a/civicrm/CRM/Contribute/BAO/Query.php
+++ b/civicrm/CRM/Contribute/BAO/Query.php
@@ -94,42 +94,10 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
if (!empty($query->_returnProperties['contribution_batch'])) {
$query->_select['contribution_batch'] = "civicrm_batch.title as contribution_batch";
$query->_element['contribution_batch'] = 1;
+ $query->_tables['civicrm_financial_trxn'] = 1;
$query->_tables['contribution_batch'] = 1;
}
- // get contribution_status
- if (!empty($query->_returnProperties['contribution_status_id'])) {
- $query->_select['contribution_status_id'] = "contribution_status.value as contribution_status_id";
- $query->_element['contribution_status_id'] = 1;
- $query->_tables['civicrm_contribution'] = 1;
- $query->_tables['contribution_status'] = 1;
- }
-
- // get contribution_status label
- if (!empty($query->_returnProperties['contribution_status'])) {
- $query->_select['contribution_status'] = "contribution_status.label as contribution_status";
- $query->_element['contribution_status'] = 1;
- $query->_tables['civicrm_contribution'] = 1;
- $query->_tables['contribution_status'] = 1;
- }
-
- // get payment instrument
- if (!empty($query->_returnProperties['payment_instrument'])) {
- $query->_select['payment_instrument'] = "contribution_payment_instrument.label as payment_instrument";
- $query->_element['payment_instrument'] = 1;
- $query->_tables['civicrm_contribution'] = 1;
- $query->_tables['contribution_payment_instrument'] = 1;
- }
-
- // get payment instrument id
- if (!empty($query->_returnProperties['payment_instrument_id'])) {
- $query->_select['instrument_id'] = "contribution_payment_instrument.value as instrument_id";
- $query->_select['payment_instrument_id'] = "contribution_payment_instrument.value as payment_instrument_id";
- $query->_element['instrument_id'] = $query->_element['payment_instrument_id'] = 1;
- $query->_tables['civicrm_contribution'] = 1;
- $query->_tables['contribution_payment_instrument'] = 1;
- }
-
if (!empty($query->_returnProperties['contribution_campaign_title'])) {
$query->_select['contribution_campaign_title'] = "civicrm_campaign.title as contribution_campaign_title";
$query->_element['contribution_campaign_title'] = $query->_tables['civicrm_campaign'] = 1;
@@ -181,7 +149,7 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
list($name, $op, $value, $grouping, $wildcard) = $values;
$quoteValue = NULL;
- $fields = array_merge(CRM_Contribute_BAO_Contribution::fields(), self::getFields());
+ $fields = self::getFields();
if (!empty($value) && !is_array($value)) {
$quoteValue = "\"$value\"";
@@ -457,6 +425,7 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
$query->_qill[$grouping][] = ts('Batch Name %1 %2', array(1 => $qillOp, 2 => $qillValue));
$query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause('civicrm_entity_batch.batch_id', $op, $value);
$query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
+ $query->_tables['civicrm_financial_trxn'] = $query->_whereTables['civicrm_financial_trxn'] = 1;
$query->_tables['contribution_batch'] = $query->_whereTables['contribution_batch'] = 1;
return;
@@ -471,7 +440,15 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
case 'contribution_is_payment':
$query->_where[$grouping][] = " civicrm_financial_trxn.is_payment $op $value";
- $query->_tables['contribution_financial_trxn'] = $query->_whereTables['contribution_financial_trxn'] = 1;
+ $query->_tables['civicrm_financial_trxn'] = $query->_whereTables['civicrm_financial_trxn'] = 1;
+ return;
+
+ case 'financial_trxn_card_type':
+ $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause('civicrm_financial_trxn.card_type', $op, $value);
+ $query->_tables['civicrm_financial_trxn'] = $query->_whereTables['civicrm_financial_trxn'] = 1;
+ $query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
+ list($op, $value) = CRM_Contact_BAO_Query::buildQillForFieldValue('CRM_Financial_DAO_FinancialTrxn', 'card_type', $value, $op);
+ $query->_qill[$grouping][] = ts('Card Type %1 %2', array(1 => $op, 2 => $value));
return;
default:
@@ -578,18 +555,6 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
$from .= " $side JOIN civicrm_product ON civicrm_contribution_product.product_id =civicrm_product.id ";
break;
- case 'contribution_payment_instrument':
- $from = " $side JOIN civicrm_option_group option_group_payment_instrument ON ( option_group_payment_instrument.name = 'payment_instrument')";
- $from .= " $side JOIN civicrm_option_value contribution_payment_instrument ON (civicrm_contribution.payment_instrument_id = contribution_payment_instrument.value
- AND option_group_payment_instrument.id = contribution_payment_instrument.option_group_id ) ";
- break;
-
- case 'contribution_status':
- $from = " $side JOIN civicrm_option_group option_group_contribution_status ON (option_group_contribution_status.name = 'contribution_status')";
- $from .= " $side 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 ) ";
- break;
-
case 'contribution_softcredit_type':
$from = " $side JOIN civicrm_option_group option_group_contribution_softcredit_type ON
(option_group_contribution_softcredit_type.name = 'soft_credit_type')";
@@ -645,18 +610,20 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
break;
case 'contribution_batch':
- $from .= " $side JOIN civicrm_entity_financial_trxn ON (
- civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution'
- AND civicrm_contribution.id = civicrm_entity_financial_trxn.entity_id )";
-
- $from .= " $side JOIN civicrm_financial_trxn ON (
- civicrm_entity_financial_trxn.financial_trxn_id = civicrm_financial_trxn.id )";
-
$from .= " $side JOIN civicrm_entity_batch ON ( civicrm_entity_batch.entity_table = 'civicrm_financial_trxn'
AND civicrm_financial_trxn.id = civicrm_entity_batch.entity_id )";
$from .= " $side JOIN civicrm_batch ON civicrm_entity_batch.batch_id = civicrm_batch.id";
break;
+
+ case 'civicrm_financial_trxn':
+ $from .= " $side JOIN civicrm_entity_financial_trxn ON (
+ civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution'
+ AND civicrm_contribution.id = civicrm_entity_financial_trxn.entity_id )";
+
+ $from .= " $side JOIN civicrm_financial_trxn ON (
+ civicrm_entity_financial_trxn.financial_trxn_id = civicrm_financial_trxn.id )";
+ break;
}
return $from;
}
@@ -773,6 +740,7 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
'product_name' => 1,
'currency' => 1,
'cancel_date' => 1,
+ 'contribution_recur_id' => 1,
);
if (self::isSoftCreditOptionEnabled()) {
$properties = array_merge($properties, self::softCreditReturnProperties());
@@ -991,6 +959,8 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
)
);
+ $form->addField('financial_trxn_card_type', array('entity' => 'FinancialTrxn', 'name' => 'card_type', 'action' => 'get'));
+
// CRM-16713 - contribution search by premiums on 'Find Contribution' form.
$form->add('select', 'contribution_product_id',
ts('Premium'),
diff --git a/civicrm/CRM/Contribute/Controller/Search.php b/civicrm/CRM/Contribute/Controller/Search.php
index 1a53377341..500d8ffd68 100644
--- a/civicrm/CRM/Contribute/Controller/Search.php
+++ b/civicrm/CRM/Contribute/Controller/Search.php
@@ -26,7 +26,6 @@
*/
/**
- *
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2017
*/
@@ -54,14 +53,8 @@ class CRM_Contribute_Controller_Search extends CRM_Core_Controller {
public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
parent::__construct($title, $modal);
-
$this->_stateMachine = new CRM_Contribute_StateMachine_Search($this, $action);
-
- // create and instantiate the pages
$this->addPages($this->_stateMachine, $action);
-
- // add all the actions
- $config = CRM_Core_Config::singleton();
$this->addActions();
}
diff --git a/civicrm/CRM/Contribute/DAO/Contribution.php b/civicrm/CRM/Contribute/DAO/Contribution.php
index 0a1a2f3eb3..13d752e081 100644
--- a/civicrm/CRM/Contribute/DAO/Contribution.php
+++ b/civicrm/CRM/Contribute/DAO/Contribution.php
@@ -30,7 +30,7 @@
*
* Generated from xml/schema/CRM/Contribute/Contribution.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b25399b3b6cf17e97809102666de8ee7)
+ * (GenCodeChecksum:3e387ab5c998da1bbb367ed526e84289)
*/
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Utils/Type.php';
@@ -334,8 +334,12 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
'payment_instrument_id' => array(
'name' => 'payment_instrument_id',
'type' => CRM_Utils_Type::T_INT,
- 'title' => ts('Payment Method') ,
+ 'title' => ts('Payment Method ID') ,
'description' => 'FK to Payment Instrument',
+ 'export' => true,
+ 'where' => 'civicrm_contribution.payment_instrument_id',
+ 'headerPattern' => '/^payment|(p(ayment\s)?instrument)$/i',
+ 'dataPattern' => '',
'table_name' => 'civicrm_contribution',
'entity' => 'Contribution',
'bao' => 'CRM_Contribute_BAO_Contribution',
diff --git a/civicrm/CRM/Contribute/Form/CloseAccPeriod.php b/civicrm/CRM/Contribute/Form/CloseAccPeriod.php
deleted file mode 100644
index 3bb7968718..0000000000
--- a/civicrm/CRM/Contribute/Form/CloseAccPeriod.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
- */
-/**
- * This class generates form components for closing an account period.
- */
-class CRM_Contribute_Form_CloseAccPeriod extends CRM_Core_Form {
-
- /**
- * Set default values.
- *
- * @return array
- */
- public function setDefaultValues() {
- $defaults = $period = array();
- $period = Civi::settings()->get('closing_date');
- if (empty($period)) {
- $prior = CRM_Contribute_BAO_Contribution::checkContributeSettings('prior_financial_period');
- }
- else {
- $defaults['closing_date'] = $period;
- return $defaults;
- }
- if (!empty($prior)) {
- $period = array(
- 'M' => date('n', strtotime($prior)),
- 'd' => date('j', strtotime($prior)),
- );
- if ($period['M'] == 1) {
- $period['M'] = 12;
- }
- else {
- $period['M']--;
- }
- $defaults['closing_date'] = $period;
- }
- else {
- $defaults['closing_date'] = array(
- 'M' => date('n', strtotime("-1 month")),
- 'd' => date('j'),
- );
- }
- return $defaults;
- }
-
- /**
- * Build the form object.
- */
- public function buildQuickForm() {
- $this->add('date', 'closing_date', ts('Accounting Period to Close'), CRM_Core_SelectValues::date(NULL, 'M d'), TRUE);
- $confirmClose = ts('Are you sure you want to close accounting period?');
- $this->addButtons(array(
- array(
- 'type' => 'cancel',
- 'name' => ts('Cancel'),
- ),
- array(
- 'type' => 'upload',
- 'name' => ts('Close Accounting Period'),
- 'js' => array('onclick' => 'return confirm(\'' . $confirmClose . '\');'),
- ),
- )
- );
- }
-
- /**
- * Global form rule.
- *
- * @param array $fields
- * The input form values.
- * @param array $files
- * The uploaded files if any.
- * @param $self
- *
- */
- public static function formRule($fields, $files, $self) {
- }
-
- /**
- * Process the form submission.
- */
- public function postProcess() {
- // store the submitted values in an array
- $params = $this->controller->exportValues($this->_name);
- // Create activity
- $activityType = CRM_Core_OptionGroup::getValue('activity_type',
- 'Close Accounting Period',
- 'name'
- );
- $activityParams = array(
- 'source_contact_id' => CRM_Core_Session::singleton()->get('userID'),
- 'assignee_contact_id' => CRM_Core_Session::singleton()->get('userID'),
- 'activity_type_id' => $activityType,
- 'subject' => ts('Close Accounting Period'),
- 'status_id' => CRM_Core_OptionGroup::getValue('activity_status',
- 'Completed',
- 'name'
- ),
- 'activity_date_time' => date('YmdHis'),
- );
- CRM_Activity_BAO_Activity::create($activityParams);
- // Set Prior Financial Period
- $priorFinPeriod = $params['closing_date']['M'] . '/' . $params['closing_date']['d'] . '/' . date('Y');
- Civi::settings()->set('prior_financial_period', date('m/d/Y', strtotime($priorFinPeriod)));
- // Set closing date
- Civi::settings()->set('closing_date', $params['closing_date']);
- CRM_Core_Session::setStatus(ts("Accounting Period has been closed successfully!"), ts('Success'), 'success');
- }
-
-}
diff --git a/civicrm/CRM/Contribute/Form/Contribution.php b/civicrm/CRM/Contribute/Form/Contribution.php
index 1f8b49c513..2d14c152ab 100644
--- a/civicrm/CRM/Contribute/Form/Contribution.php
+++ b/civicrm/CRM/Contribute/Form/Contribution.php
@@ -283,10 +283,11 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
else {
$lineItem = CRM_Price_BAO_LineItem::getLineItems($this->_id, 'contribution', 1, TRUE, TRUE);
}
+ // wtf?
empty($lineItem) ? NULL : $this->_lineItems[] = $lineItem;
}
- $this->assign('lineItem', empty($this->_lineItems) ? FALSE : $this->_lineItems);
+ $this->assign('lineItem', empty($lineItem) ? FALSE : array($lineItem));
// Set title
if ($this->_mode && $this->_id) {
@@ -377,10 +378,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
$defaults['fee_amount'] = CRM_Utils_Money::format($defaults['fee_amount'], NULL, '%a');
}
- if (isset($defaults['net_amount'])) {
- $defaults['net_amount'] = CRM_Contribute_BAO_Contribution::calculateNetAmount($defaults['net_amount'], CRM_Utils_Array::value('tax_amount', $defaults));
- }
-
if ($this->_contributionType) {
$defaults['financial_type_id'] = $this->_contributionType;
}
@@ -649,10 +646,11 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
$paymentInstrument = FALSE;
if (!$this->_mode) {
+ $checkPaymentID = array_search('Check', CRM_Contribute_PseudoConstant::paymentInstrument('name'));
$paymentInstrument = $this->add('select', 'payment_instrument_id',
ts('Payment Method'),
array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::paymentInstrument(),
- TRUE, array('onChange' => "return showHideByValue('payment_instrument_id','4','checkNumber','table-row','select',false);")
+ TRUE, array('onChange' => "return showHideByValue('payment_instrument_id','{$checkPaymentID}','checkNumber','table-row','select',false);")
);
}
@@ -1436,7 +1434,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
* @throws \Exception
*/
protected function submit($submittedValues, $action, $pledgePaymentID) {
- $softIDs = array();
+
$pId = $contribution = $isRelatedId = FALSE;
$this->_params = $submittedValues;
$this->beginPostProcess();
@@ -1589,7 +1587,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
}
if (!isset($submittedValues['total_amount'])) {
- $submittedValues['total_amount'] = CRM_Utils_Array::value('total_amount', $this->_values);
+ $submittedValues['total_amount'] = CRM_Utils_Array::value('total_amount', $this->_values) - CRM_Utils_Array::value('tax_amount', $this->_values);
}
$this->assign('lineItem', !empty($lineItem) && !$isQuickConfig ? $lineItem : FALSE);
@@ -1801,13 +1799,8 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
}
$taxRate = array();
$getTaxDetails = FALSE;
- if ($action & CRM_Core_Action::ADD) {
- $line = $lineItem;
- }
- elseif ($action & CRM_Core_Action::UPDATE) {
- $line = $this->_lineItems;
- }
- foreach ($line as $key => $value) {
+
+ foreach ($lineItem as $key => $value) {
foreach ($value as $v) {
if (isset($taxRate[(string) CRM_Utils_Array::value('tax_rate', $v)])) {
$taxRate[(string) $v['tax_rate']] = $taxRate[(string) $v['tax_rate']] + CRM_Utils_Array::value('tax_amount', $v);
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
index a4a03f0d4d..f6f1e657cc 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1641,6 +1641,10 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// Since we have called the membership contribution (in a 2 contribution scenario) this is out
// primary-contribution compared to that - but let's face it - it's all just too hard & confusing at the moment!
$paymentParams = array_merge($form->_params, array('contributionID' => $form->_values['contribution_other_id']));
+
+ // CRM-19792 : set necessary fields for payment processor
+ CRM_Core_Payment_Form::mapParams($form->_bltID, $paymentParams, $paymentParams, TRUE);
+
$paymentActionResult = $payment->doPayment($paymentParams, 'contribute');
$paymentResults[] = array('contribution_id' => $paymentResult['contribution']->id, 'result' => $paymentActionResult);
// Do not send an email if Recurring transaction is done via Direct Mode
@@ -1759,6 +1763,10 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
$contributionParams['payment_instrument_id'] = $form->_paymentProcessor['payment_instrument_id'];
}
}
+
+ // CRM-19792 : set necessary fields for payment processor
+ CRM_Core_Payment_Form::mapParams($form->_bltID, $form->_params, $tempParams, TRUE);
+
$membershipContribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution($form,
$tempParams,
$tempParams,
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Main.php b/civicrm/CRM/Contribute/Form/Contribution/Main.php
index c2e38e902d..f3cfc33270 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Main.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -566,6 +566,13 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$form->assign('is_recur_interval', CRM_Utils_Array::value('is_recur_interval', $form->_values));
$form->assign('is_recur_installments', CRM_Utils_Array::value('is_recur_installments', $form->_values));
+ $paymentObject = $form->getVar('_paymentObject');
+ if ($paymentObject) {
+ $form->assign('recurringHelpText', $paymentObject->getText('contributionPageRecurringHelp', array(
+ 'is_recur_installments' => !empty($form->_values['is_recur_installments']),
+ 'is_email_receipt' => !empty($form->_values['is_email_receipt']),
+ )));
+ }
$form->add('checkbox', 'is_recur', ts('I want to contribute this amount'), NULL);
diff --git a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
index c211ce0d10..62dee7c050 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -117,7 +117,7 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
if ($invoicing) {
$getTaxDetails = FALSE;
$taxTerm = CRM_Utils_Array::value('tax_term', $invoiceSettings);
- foreach ($this->_lineItem as $key => $value) {
+ foreach ($this->_lineItem as $value) {
foreach ($value as $v) {
if (isset($v['tax_rate'])) {
if ($v['tax_rate'] != '') {
@@ -131,7 +131,6 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
$this->assign('totalTaxAmount', $params['tax_amount']);
}
if (!empty($this->_values['honoree_profile_id']) && !empty($params['soft_credit_type_id'])) {
- $honorName = NULL;
$softCreditTypes = CRM_Core_OptionGroup::values("soft_credit_type", FALSE);
$this->assign('soft_credit_type', $softCreditTypes[$params['soft_credit_type_id']]);
@@ -284,6 +283,28 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
$this->assign('friendURL', $url);
}
+ $isPendingOutcome = TRUE;
+ try {
+ // A payment notification update could have come in at any time. Check at the last minute.
+ $contributionStatusID = civicrm_api3('Contribution', 'getvalue', array(
+ 'id' => CRM_Utils_Array::value('contributionID', $params),
+ 'return' => 'contribution_status_id',
+ 'invoice_id' => CRM_Utils_Array::value('invoiceID', $params),
+ ));
+ if (CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $contributionStatusID) === 'Pending'
+ && !empty($params['payment_processor_id'])
+ ) {
+ $isPendingOutcome = TRUE;
+ }
+ else {
+ $isPendingOutcome = FALSE;
+ }
+ }
+ catch (CiviCRM_API3_Exception $e) {
+
+ }
+ $this->assign('isPendingOutcome', $isPendingOutcome);
+
$this->freeze();
// can we blow away the session now to prevent hackery
diff --git a/civicrm/CRM/Contribute/Form/Task.php b/civicrm/CRM/Contribute/Form/Task.php
index fdbcbd18d0..3f1a4e50f8 100644
--- a/civicrm/CRM/Contribute/Form/Task.php
+++ b/civicrm/CRM/Contribute/Form/Task.php
@@ -115,6 +115,22 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form {
}
else {
$queryParams = $form->get('queryParams');
+ $isTest = FALSE;
+ foreach ($queryParams as $fields) {
+ if ($fields[0] == 'contribution_test') {
+ $isTest = TRUE;
+ break;
+ }
+ }
+ if (!$isTest) {
+ $queryParams[] = array(
+ 'contribution_test',
+ '=',
+ 0,
+ 0,
+ 0,
+ );
+ }
$returnProperties = array('contribution_id' => 1);
$sortOrder = $sortCol = NULL;
if ($form->get(CRM_Utils_Sort::SORT_ORDER)) {
diff --git a/civicrm/CRM/Contribute/Form/Task/PDF.php b/civicrm/CRM/Contribute/Form/Task/PDF.php
index 508460c8b2..2455d38fde 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDF.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDF.php
@@ -206,7 +206,7 @@ AND {$this->_componentClause}";
$input['receipt_from_name'] = str_replace('"', '', $fromDetails[0]);
}
- $mail = CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution']->id, $values, FALSE,
+ $mail = CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution']->id, $values,
$elements['createPdf']);
if ($mail['html']) {
diff --git a/civicrm/CRM/Contribute/Selector/Search.php b/civicrm/CRM/Contribute/Selector/Search.php
index 23181c272c..4ab8cad807 100644
--- a/civicrm/CRM/Contribute/Selector/Search.php
+++ b/civicrm/CRM/Contribute/Selector/Search.php
@@ -26,21 +26,17 @@
*/
/**
- *
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2017
*/
/**
- * This class is used to retrieve and display a range of
- * contacts that match the given criteria (specifically for
- * results of advanced search options.
- *
+ * Class to render contribution search results.
*/
class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements CRM_Core_Selector_API {
/**
- * This defines two actions- View and Edit.
+ * Array of action links.
*
* @var array
*/
@@ -366,6 +362,7 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
$allCampaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE);
while ($result->fetch()) {
+ $this->_query->convertToPseudoNames($result);
$links = self::links($componentId,
$componentAction,
$qfKey,
@@ -448,6 +445,14 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
if ($row['contribution_status_name'] == 'Pending refund') {
$buttonName = ts('Record Refund');
}
+ elseif (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
+ $links[CRM_Core_Action::BASIC] = array(
+ 'name' => ts('Submit Credit Card payment'),
+ 'url' => 'civicrm/payment/add',
+ 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=contribution&mode=live',
+ 'title' => ts('Submit Credit Card payment'),
+ );
+ }
$links[CRM_Core_Action::ADD] = array(
'name' => $buttonName,
'url' => 'civicrm/payment',
diff --git a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
index c303bcf26f..66b318e5f3 100644
--- a/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
+++ b/civicrm/CRM/Contribute/xml/Menu/Contribute.xml
@@ -318,15 +318,6 @@
<weight>630</weight>
<component>CiviContribute</component>
</item>
- <item>
- <path>civicrm/admin/contribute/closeaccperiod</path>
- <title>Close Accounting Period</title>
- <page_callback>CRM_Contribute_Form_CloseAccPeriod</page_callback>
- <access_arguments>access CiviContribute,administer CiviCRM,administer Accounting</access_arguments>
- <page_type>1</page_type>
- <weight>640</weight>
- <component>CiviContribute</component>
- </item>
<item>
<path>civicrm/ajax/softcontributionlist</path>
<page_callback>CRM_Contribute_Page_AJAX::getSoftContributionRows</page_callback>
diff --git a/civicrm/CRM/Core/BAO/Cache.php b/civicrm/CRM/Core/BAO/Cache.php
index 1f295535a6..31c4355b6b 100644
--- a/civicrm/CRM/Core/BAO/Cache.php
+++ b/civicrm/CRM/Core/BAO/Cache.php
@@ -146,18 +146,17 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
$table = self::getTableName();
$where = self::whereCache($group, $path, $componentID);
- $id = CRM_Core_DAO::singleValueQuery("SELECT id FROM $table WHERE $where");
+ $dataExists = CRM_Core_DAO::singleValueQuery("SELECT COUNT(*) FROM $table WHERE {$where}");
$now = date('Y-m-d H:i:s'); // FIXME - Use SQL NOW() or CRM_Utils_Time?
$dataSerialized = serialize($data);
// This table has a wonky index, so we cannot use REPLACE or
// "INSERT ... ON DUPE". Instead, use SELECT+(INSERT|UPDATE).
- if ($id) {
- $sql = "UPDATE $table SET data = %1, created_date = %2 WHERE id = %3";
+ if ($dataExists) {
+ $sql = "UPDATE $table SET data = %1, created_date = %2 WHERE {$where}";
$args = array(
1 => array($dataSerialized, 'String'),
2 => array($now, 'String'),
- 3 => array($id, 'Int'),
);
$dao = CRM_Core_DAO::executeQuery($sql, $args, TRUE, NULL, FALSE, FALSE);
}
diff --git a/civicrm/CRM/Core/BAO/CustomField.php b/civicrm/CRM/Core/BAO/CustomField.php
index 82bfee3e06..b5dff555e5 100644
--- a/civicrm/CRM/Core/BAO/CustomField.php
+++ b/civicrm/CRM/Core/BAO/CustomField.php
@@ -1218,7 +1218,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
// Or should we throw an exception here if it is?
$value = is_array($value) ? CRM_Utils_Array::first($value) : $value;
- $actualPHPFormats = CRM_Core_SelectValues::datePluginToPHPFormats();
+ $actualPHPFormats = CRM_Utils_Date::datePluginToPHPFormats();
$format = CRM_Utils_Array::value('date_format', $field);
if ($format) {
diff --git a/civicrm/CRM/Core/BAO/Domain.php b/civicrm/CRM/Core/BAO/Domain.php
index 1bfd8e7e98..6b1f6cf2db 100644
--- a/civicrm/CRM/Core/BAO/Domain.php
+++ b/civicrm/CRM/Core/BAO/Domain.php
@@ -69,7 +69,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
*
* @return CRM_Core_BAO_Domain|null
*/
- public static function &getDomain($reset = NULL) {
+ public static function getDomain($reset = NULL) {
static $domain = NULL;
if (!$domain || $reset) {
$domain = new CRM_Core_BAO_Domain();
@@ -81,39 +81,6 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
return $domain;
}
- /**
- * Change active domain (ie. to perform a temporary action) such as changing
- * config for all domains
- *
- * Switching around the global domain variable is very risky business. This
- * is ONLY used as a hack to allow CRM_Core_BAO_Setting::setItems to manipulate
- * the civicrm_domain.config_backend in multiple domains. When/if config_backend
- * goes away, this hack should be removed.
- *
- * @param int $domainID
- * Id for domain you want to set as current.
- * @deprecated
- * @see http://issues.civicrm.org/jira/browse/CRM-11204
- */
- public static function setDomain($domainID) {
- CRM_Core_Config::domainID($domainID);
- self::getDomain($domainID);
- CRM_Core_Config::singleton(TRUE, TRUE);
- }
-
- /**
- * Reset domain to default (ie. as loaded from settings). This is the
- * counterpart to CRM_Core_BAO_Domain::setDomain.
- *
- * @deprecated
- * @see CRM_Core_BAO_Domain::setDomain
- */
- public static function resetDomain() {
- CRM_Core_Config::domainID(NULL, TRUE);
- self::getDomain(NULL, TRUE);
- CRM_Core_Config::singleton(TRUE, TRUE);
- }
-
/**
* @param bool $skipUsingCache
*
diff --git a/civicrm/CRM/Core/BAO/Log.php b/civicrm/CRM/Core/BAO/Log.php
index f81d5ebc9c..9876534010 100644
--- a/civicrm/CRM/Core/BAO/Log.php
+++ b/civicrm/CRM/Core/BAO/Log.php
@@ -28,9 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -166,16 +164,16 @@ UPDATE civicrm_log
}
/**
- * Function for find out whether to use logging schema entries for contact.
- * summary, instead of normal log entries.
+ * Get the id of the report to use to display the change log.
*
- * @return int
- * report id of Contact Logging Report (Summary) / false
+ * If logging is not enabled a return value of FALSE means to use the
+ * basic change log view.
+ *
+ * @return int|FALSE
+ * report id of Contact Logging Report (Summary)
*/
public static function useLoggingReport() {
- // first check if logging is enabled
- $config = CRM_Core_Config::singleton();
- if (!$config->logging) {
+ if (!\Civi::settings()->get('logging')) {
return FALSE;
}
diff --git a/civicrm/CRM/Core/BAO/Mapping.php b/civicrm/CRM/Core/BAO/Mapping.php
index 4b0d9106ed..d45ef17529 100644
--- a/civicrm/CRM/Core/BAO/Mapping.php
+++ b/civicrm/CRM/Core/BAO/Mapping.php
@@ -381,7 +381,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
if (($mappingType == 'Search Builder') || ($exportMode == CRM_Export_Form_Select::CONTRIBUTE_EXPORT)) {
if (CRM_Core_Permission::access('CiviContribute')) {
- $fields['Contribution'] = CRM_Contribute_BAO_Contribution::exportableFields();
+ $fields['Contribution'] = CRM_Contribute_BAO_Contribution::getExportableFieldsWithPseudoConstants();
unset($fields['Contribution']['contribution_contact_id']);
$compArray['Contribution'] = ts('Contribution');
}
diff --git a/civicrm/CRM/Core/BAO/MessageTemplate.php b/civicrm/CRM/Core/BAO/MessageTemplate.php
index 25dc4e0c4d..2b87046c0e 100644
--- a/civicrm/CRM/Core/BAO/MessageTemplate.php
+++ b/civicrm/CRM/Core/BAO/MessageTemplate.php
@@ -476,12 +476,12 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
$contact = $contact[$contactID];
}
- $mailContent['subject'] = CRM_Utils_Token::replaceDomainTokens($mailContent['subject'], $domain, FALSE, $tokens['text'], TRUE);
+ $mailContent['subject'] = CRM_Utils_Token::replaceDomainTokens($mailContent['subject'], $domain, FALSE, $tokens['subject'], TRUE);
$mailContent['text'] = CRM_Utils_Token::replaceDomainTokens($mailContent['text'], $domain, FALSE, $tokens['text'], TRUE);
$mailContent['html'] = CRM_Utils_Token::replaceDomainTokens($mailContent['html'], $domain, TRUE, $tokens['html'], TRUE);
if ($contactID) {
- $mailContent['subject'] = CRM_Utils_Token::replaceContactTokens($mailContent['subject'], $contact, FALSE, $tokens['text'], FALSE, TRUE);
+ $mailContent['subject'] = CRM_Utils_Token::replaceContactTokens($mailContent['subject'], $contact, FALSE, $tokens['subject'], FALSE, TRUE);
$mailContent['text'] = CRM_Utils_Token::replaceContactTokens($mailContent['text'], $contact, FALSE, $tokens['text'], FALSE, TRUE);
$mailContent['html'] = CRM_Utils_Token::replaceContactTokens($mailContent['html'], $contact, FALSE, $tokens['html'], FALSE, TRUE);
diff --git a/civicrm/CRM/Core/BAO/Navigation.php b/civicrm/CRM/Core/BAO/Navigation.php
index 82cd56bbe2..a4ae608bbd 100644
--- a/civicrm/CRM/Core/BAO/Navigation.php
+++ b/civicrm/CRM/Core/BAO/Navigation.php
@@ -264,45 +264,25 @@ FROM civicrm_navigation WHERE domain_id = $domainID {$whereClause} ORDER BY pare
/**
* Build navigation tree.
*
- * @param array $navigationTree
- * Nested array of menus.
- * @param int $parentID
- * Parent id.
- * @param bool $navigationMenu
- * True when called for building top navigation menu.
- *
* @return array
* nested array of menus
*/
- public static function buildNavigationTree(&$navigationTree, $parentID, $navigationMenu = TRUE) {
- $whereClause = " parent_id IS NULL";
-
- if ($parentID) {
- $whereClause = " parent_id = {$parentID}";
- }
-
+ public static function buildNavigationTree() {
$domainID = CRM_Core_Config::domainID();
+ $navigationTree = array();
// get the list of menus
$query = "
SELECT id, label, url, permission, permission_operator, has_separator, parent_id, is_active, name
FROM civicrm_navigation
-WHERE {$whereClause}
-AND domain_id = $domainID
+WHERE domain_id = $domainID
ORDER BY parent_id, weight";
$navigation = CRM_Core_DAO::executeQuery($query);
- $config = CRM_Core_Config::singleton();
while ($navigation->fetch()) {
- $label = $navigation->label;
- if (!$navigationMenu) {
- $label = addcslashes($label, '"');
- }
-
- // for each menu get their children
$navigationTree[$navigation->id] = array(
'attributes' => array(
- 'label' => $label,
+ 'label' => $navigation->label,
'name' => $navigation->name,
'url' => $navigation->url,
'permission' => $navigation->permission,
@@ -313,75 +293,69 @@ ORDER BY parent_id, weight";
'active' => $navigation->is_active,
),
);
- self::buildNavigationTree($navigationTree[$navigation->id]['child'], $navigation->id, $navigationMenu);
}
- return $navigationTree;
+ return self::buildTree($navigationTree);
}
/**
- * Build menu.
+ * Convert flat array to nested.
+ *
+ * @param array $elements
+ * @param int|null $parentId
*
- * @param bool $json
- * By default output is html.
- * @param bool $navigationMenu
- * True when called for building top navigation menu.
+ * @return array
+ */
+ private static function buildTree($elements, $parentId = NULL) {
+ $branch = array();
+
+ foreach ($elements as $id => $element) {
+ if ($element['attributes']['parentID'] == $parentId) {
+ $children = self::buildTree($elements, $id);
+ if ($children) {
+ $element['child'] = $children;
+ }
+ $branch[$id] = $element;
+ }
+ }
+
+ return $branch;
+ }
+
+ /**
+ * Build menu.
*
* @return string
- * html or json string
*/
- public static function buildNavigation($json = FALSE, $navigationMenu = TRUE) {
- $navigations = array();
- self::buildNavigationTree($navigations, $parent = NULL, $navigationMenu);
- $navigationString = NULL;
+ public static function buildNavigation() {
+ $navigations = self::buildNavigationTree();
+ $navigationString = '';
// run the Navigation through a hook so users can modify it
CRM_Utils_Hook::navigationMenu($navigations);
self::fixNavigationMenu($navigations);
- $i18n = CRM_Core_I18n::singleton();
-
//skip children menu item if user don't have access to parent menu item
$skipMenuItems = array();
foreach ($navigations as $key => $value) {
- if ($json) {
- if ($navigationString) {
- $navigationString .= '},';
- }
- $data = $value['attributes']['label'];
- $class = '';
- if (!$value['attributes']['active']) {
- $class = ', "attr": { "class" : "disabled"} ';
- }
- $l10nName = $i18n->crm_translate($data, array('context' => 'menu'));
- $navigationString .= ' { "attr": { "id" : "node_' . $key . '"}, "data": { "title":"' . $l10nName . '"' . $class . '}';
- }
- else {
- // Home is a special case
- if ($value['attributes']['name'] != 'Home') {
- $name = self::getMenuName($value, $skipMenuItems);
- if ($name) {
- //separator before
- if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 2) {
- $navigationString .= '<li class="menu-separator"></li>';
- }
- $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
- $navigationString .= '<li class="menumain crm-' . str_replace($removeCharacters, '_', $value['attributes']['label']) . '">' . $name;
+ // Home is a special case
+ if ($value['attributes']['name'] != 'Home') {
+ $name = self::getMenuName($value, $skipMenuItems);
+ if ($name) {
+ //separator before
+ if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 2) {
+ $navigationString .= '<li class="menu-separator"></li>';
}
+ $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
+ $navigationString .= '<li class="menumain crm-' . str_replace($removeCharacters, '_', $value['attributes']['label']) . '">' . $name;
}
}
-
- self::recurseNavigation($value, $navigationString, $json, $skipMenuItems);
+ self::recurseNavigation($value, $navigationString, $skipMenuItems);
}
- if ($json) {
- $navigationString = '[' . $navigationString . '}]';
- }
- else {
- // clean up - Need to remove empty <ul>'s, this happens when user don't have
- // permission to access parent
- $navigationString = str_replace('<ul></ul></li>', '', $navigationString);
- }
+ // clean up - Need to remove empty <ul>'s, this happens when user don't have
+ // permission to access parent
+ $navigationString = str_replace('<ul></ul></li>', '', $navigationString);
return $navigationString;
}
@@ -391,74 +365,40 @@ ORDER BY parent_id, weight";
*
* @param array $value
* @param string $navigationString
- * @param bool $json
- * @param bool $skipMenuItems
+ * @param array $skipMenuItems
*
* @return string
*/
- public static function recurseNavigation(&$value, &$navigationString, $json, $skipMenuItems) {
- if ($json) {
- if (!empty($value['child'])) {
- $navigationString .= ', "children": [ ';
- }
- else {
- return $navigationString;
- }
-
- if (!empty($value['child'])) {
- $appendComma = TRUE;
- $count = 1;
- foreach ($value['child'] as $k => $val) {
- if ($count == count($value['child'])) {
- $appendComma = FALSE;
- }
- $data = $val['attributes']['label'];
- $class = '';
- if (!$val['attributes']['active']) {
- $class = ', "attr": { "class" : "disabled"} ';
- }
- $navigationString .= ' { "attr": { "id" : "node_' . $k . '"}, "data": { "title":"' . $data . '"' . $class . '}';
- self::recurseNavigation($val, $navigationString, $json, $skipMenuItems);
- $navigationString .= $appendComma ? ' },' : ' }';
- $count++;
- }
- }
-
- if (!empty($value['child'])) {
- $navigationString .= ' ]';
- }
+ public static function recurseNavigation(&$value, &$navigationString, $skipMenuItems) {
+ if (!empty($value['child'])) {
+ $navigationString .= '<ul>';
}
else {
- if (!empty($value['child'])) {
- $navigationString .= '<ul>';
- }
- else {
- $navigationString .= '</li>';
- //locate separator after
- if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
- $navigationString .= '<li class="menu-separator"></li>';
- }
+ $navigationString .= '</li>';
+ //locate separator after
+ if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
+ $navigationString .= '<li class="menu-separator"></li>';
}
+ }
- if (!empty($value['child'])) {
- foreach ($value['child'] as $val) {
- $name = self::getMenuName($val, $skipMenuItems);
- if ($name) {
- //locate separator before
- if (isset($val['attributes']['separator']) && $val['attributes']['separator'] == 2) {
- $navigationString .= '<li class="menu-separator"></li>';
- }
- $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
- $navigationString .= '<li class="crm-' . str_replace($removeCharacters, '_', $val['attributes']['label']) . '">' . $name;
- self::recurseNavigation($val, $navigationString, $json, $skipMenuItems);
+ if (!empty($value['child'])) {
+ foreach ($value['child'] as $val) {
+ $name = self::getMenuName($val, $skipMenuItems);
+ if ($name) {
+ //locate separator before
+ if (isset($val['attributes']['separator']) && $val['attributes']['separator'] == 2) {
+ $navigationString .= '<li class="menu-separator"></li>';
}
+ $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
+ $navigationString .= '<li class="crm-' . str_replace($removeCharacters, '_', $val['attributes']['label']) . '">' . $name;
+ self::recurseNavigation($val, $navigationString, $skipMenuItems);
}
}
- if (!empty($value['child'])) {
- $navigationString .= '</ul></li>';
- if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
- $navigationString .= '<li class="menu-separator"></li>';
- }
+ }
+ if (!empty($value['child'])) {
+ $navigationString .= '</ul></li>';
+ if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
+ $navigationString .= '<li class="menu-separator"></li>';
}
}
return $navigationString;
@@ -836,26 +776,6 @@ ORDER BY parent_id, weight";
CRM_Core_DAO::executeQuery($query);
}
- /**
- * Get the info on navigation item.
- *
- * @param int $navigationID
- * Navigation id.
- *
- * @return array
- * associated array
- */
- public static function getNavigationInfo($navigationID) {
- $query = "SELECT parent_id, weight FROM civicrm_navigation WHERE id = %1";
- $params = array($navigationID, 'Integer');
- $dao = CRM_Core_DAO::executeQuery($query, array(1 => $params));
- $dao->fetch();
- return array(
- 'parent_id' => $dao->parent_id,
- 'weight' => $dao->weight,
- );
- }
-
/**
* Update menu.
*
diff --git a/civicrm/CRM/Core/BAO/OptionGroup.php b/civicrm/CRM/Core/BAO/OptionGroup.php
index 7a6931400c..d0f0afc71b 100644
--- a/civicrm/CRM/Core/BAO/OptionGroup.php
+++ b/civicrm/CRM/Core/BAO/OptionGroup.php
@@ -184,4 +184,39 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
}
}
+ /**
+ * Get the title of an option group by name.
+ *
+ * @param string $name
+ * The name value for the option group table.
+ *
+ * @return string
+ * The relevant title.
+ */
+ public static function getTitleByName($name) {
+ $groups = self::getTitlesByNames();
+ return $groups[$name];
+ }
+
+ /**
+ * Get a cached mapping of all group titles indexed by their unique name.
+ *
+ * We tend to only have a limited number of option groups so memory caching
+ * makes more sense than multiple look-ups.
+ *
+ * @return array
+ * Array of all group titles by name.
+ * e.g
+ * array('activity_status' => 'Activity Status', 'msg_mode' => 'Message Mode'....)
+ */
+ public static function getTitlesByNames() {
+ if (!isset(\Civi::$statics[__CLASS__]) || !isset(\Civi::$statics[__CLASS__]['titles_by_name'])) {
+ $dao = CRM_Core_DAO::executeQuery("SELECT name, title FROM civicrm_option_group");
+ while ($dao->fetch()) {
+ \Civi::$statics[__CLASS__]['titles_by_name'][$dao->name] = $dao->title;
+ }
+ }
+ return \Civi::$statics[__CLASS__]['titles_by_name'];
+ }
+
}
diff --git a/civicrm/CRM/Core/BAO/Phone.php b/civicrm/CRM/Core/BAO/Phone.php
index d3e74c0124..180a4425dd 100644
--- a/civicrm/CRM/Core/BAO/Phone.php
+++ b/civicrm/CRM/Core/BAO/Phone.php
@@ -171,7 +171,9 @@ ORDER BY civicrm_phone.is_primary DESC, phone_id ASC ";
}
/**
- * Get all the phone numbers for a specified location_block id, with the primary phone being first
+ * Get all the phone numbers for a specified location_block id, with the primary phone being first.
+ *
+ * This is called from CRM_Core_BAO_Block as a calculated function.
*
* @param array $entityElements
* The array containing entity_id and.
diff --git a/civicrm/CRM/Core/BAO/PrevNextCache.php b/civicrm/CRM/Core/BAO/PrevNextCache.php
index ed1e367bd4..a3d6f44123 100644
--- a/civicrm/CRM/Core/BAO/PrevNextCache.php
+++ b/civicrm/CRM/Core/BAO/PrevNextCache.php
@@ -29,22 +29,22 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
*/
/**
- * BAO object for civicrm_prevnext_cache table
+ * BAO object for civicrm_prevnext_cache table.
*/
class CRM_Core_BAO_PrevNextCache extends CRM_Core_DAO_PrevNextCache {
/**
- * @param $cacheKey
- * @param $id1
- * @param $id2
+ * Get the previous and next keys.
+ *
+ * @param string $cacheKey
+ * @param int $id1
+ * @param int $id2
* @param int $mergeId
- * @param NULL $join
- * @param NULL $where
+ * @param string $join
+ * @param string $where
* @param bool $flip
*
* @return array
@@ -113,8 +113,10 @@ WHERE cacheKey = %3 AND
}
/**
+ * Delete an item from the prevnext cache table based on the entity.
+ *
* @param int $id
- * @param NULL $cacheKey
+ * @param string $cacheKey
* @param string $entityTable
*/
public static function deleteItem($id = NULL, $cacheKey = NULL, $entityTable = 'civicrm_contact') {
@@ -136,9 +138,11 @@ WHERE cacheKey = %3 AND
}
/**
- * @param $id1
- * @param $id2
- * @param NULL $cacheKey
+ * Delete from the previous next cache table for a pair of ids.
+ *
+ * @param int $id1
+ * @param int $id2
+ * @param string $cacheKey
* @param bool $isViceVersa
* @param string $entityTable
*/
@@ -224,6 +228,7 @@ WHERE cacheKey = %3 AND
* @param bool $includeConflicts
* Should we return rows that have already been idenfified as having a conflict.
* When this is TRUE you should be careful you do not set up a loop.
+ * @param array $params
*
* @return array
*/
@@ -282,7 +287,7 @@ FROM civicrm_prevnext_cache pn
if (!empty($select)) {
$extraData = array();
- foreach ($select as $dfield => $sfield) {
+ foreach ($select as $sfield) {
$extraData[$sfield] = $dao->$sfield;
}
$main[$count] = array(
@@ -321,7 +326,9 @@ FROM civicrm_prevnext_cache pn
}
/**
- * @param $cacheKey
+ * Get count of matching rows.
+ *
+ * @param string $cacheKey
* @param string $join
* @param string $where
* @param string $op
@@ -559,7 +566,7 @@ WHERE cacheKey LIKE %1
$cacheKey = "civicrm search {$qfKey}";
$query = "
-SELECT count(id)
+SELECT count(*)
FROM civicrm_prevnext_cache
WHERE cacheKey LIKE %1
AND is_selected = 1
diff --git a/civicrm/CRM/Core/BAO/Setting.php b/civicrm/CRM/Core/BAO/Setting.php
index 30490cb858..3324f43bf5 100644
--- a/civicrm/CRM/Core/BAO/Setting.php
+++ b/civicrm/CRM/Core/BAO/Setting.php
@@ -120,16 +120,10 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
if (!empty($settingsToReturn) && !is_array($settingsToReturn)) {
$settingsToReturn = array($settingsToReturn);
}
- $reloadConfig = FALSE;
$fields = $result = array();
$fieldsToGet = self::validateSettingsInput(array_flip($settingsToReturn), $fields, FALSE);
foreach ($domains as $domainID) {
- if ($domainID != CRM_Core_Config::domainID()) {
- $reloadConfig = TRUE;
- CRM_Core_BAO_Domain::setDomain($domainID);
- }
- $config = CRM_Core_Config::singleton($reloadConfig, $reloadConfig);
$result[$domainID] = array();
foreach ($fieldsToGet as $name => $value) {
$contactID = CRM_Utils_Array::value('contact_id', $params);
@@ -140,7 +134,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
$result[$domainID][$name] = $setting;
}
}
- CRM_Core_BAO_Domain::resetDomain();
}
return $result;
}
diff --git a/civicrm/CRM/Core/BAO/Tag.php b/civicrm/CRM/Core/BAO/Tag.php
index 936998aa99..31722e897d 100644
--- a/civicrm/CRM/Core/BAO/Tag.php
+++ b/civicrm/CRM/Core/BAO/Tag.php
@@ -29,11 +29,14 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
*/
class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
+ /**
+ * @var array
+ */
+ protected $tree;
+
/**
* Class constructor.
*/
@@ -63,7 +66,9 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
}
/**
- * @param null $usedFor
+ * Get tag tree.
+ *
+ * @param string $usedFor
* @param bool $excludeHidden
*
* @return mixed
@@ -76,7 +81,9 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
}
/**
- * Build a nested array from hierarchical tags. Supports infinite levels of nesting.
+ * Build a nested array from hierarchical tags.
+ *
+ * Supports infinite levels of nesting.
* @param null $usedFor
* @param bool $excludeHidden
*/
@@ -97,7 +104,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
$sql .= " ORDER BY parent_id,name";
- $dao = CRM_Core_DAO::executeQuery($sql, CRM_Core_DAO::$_nullArray, TRUE, NULL, FALSE, FALSE);
+ $dao = CRM_Core_DAO::executeQuery($sql, array(), TRUE, NULL, FALSE, FALSE);
$refs = array();
$this->tree = array();
@@ -119,6 +126,8 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
}
/**
+ * Get tags used for the given entity/entities.
+ *
* @param array $usedFor
* @param bool $buildSelect
* @param bool $all
diff --git a/civicrm/CRM/Core/BAO/UFGroup.php b/civicrm/CRM/Core/BAO/UFGroup.php
index 272cf8be89..3af88e2ffd 100644
--- a/civicrm/CRM/Core/BAO/UFGroup.php
+++ b/civicrm/CRM/Core/BAO/UFGroup.php
@@ -538,11 +538,8 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup {
if (CRM_Utils_Array::value('html_type', $formattedField) == 'Select Date') {
$formattedField['date_format'] = $customFields[$field->field_name]['date_format'];
$formattedField['time_format'] = $customFields[$field->field_name]['time_format'];
- $formattedField['php_datetime_format'] = CRM_Utils_Date::getPhpDateFormatFromInputStyleDateFormat($customFields[$field->field_name]['date_format']);
- if ($formattedField['time_format']) {
- $formattedField['php_datetime_format'] .= ' H-i-s';
- }
$formattedField['is_datetime_field'] = TRUE;
+ $formattedField['smarty_view_format'] = CRM_Utils_Date::getDateFieldViewFormat($formattedField['date_format']);
}
$formattedField['is_multi_summary'] = $field->is_multi_summary;
@@ -1219,9 +1216,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup {
elseif (in_array($name, array(
'birth_date',
'deceased_date',
- 'membership_start_date',
- 'membership_end_date',
- 'join_date',
))) {
// @todo this set should be determined from metadata, not hard-coded.
$values[$index] = CRM_Utils_Date::customFormat($details->$name);
@@ -2276,6 +2270,11 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
if (substr($fieldName, 0, 3) === 'is_' or substr($fieldName, 0, 7) === 'do_not_') {
$form->add('advcheckbox', $name, $title, $attributes, $required);
}
+ elseif (CRM_Utils_Array::value('html_type', $field) === 'Select Date') {
+ $extra = isset($field['datepicker']) ? $field['datepicker']['extra'] : CRM_Utils_Date::getDatePickerExtra($field);
+ $attributes = isset($field['datepicker']) ? $field['datepicker']['attributes'] : CRM_Utils_Date::getDatePickerAttributes($field);
+ $form->add('datepicker', $name, $title, $attributes, $required, $extra);
+ }
else {
$form->add('text', $name, $title, $attributes, $required);
}
@@ -2328,17 +2327,10 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
*/
static public function getNonUpgradedDateFields() {
return array(
- 'birth_date' => 'birth',
- 'deceased_date' => 'birth',
- 'membership_start_date' => 'activityDate',
- 'membership_end_date' => 'activityDate',
- 'join_date' => 'activityDate',
'receive_date' => 'activityDateTime',
'receipt_date' => 'activityDateTime',
'thankyou_date' => 'activityDateTime',
'cancel_date' => 'activityDateTime',
- 'participant_register_date' => 'activityDateTime',
- 'activity_date_time' => 'activityDateTime',
);
}
@@ -2392,10 +2384,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
if (!empty($details[$name]) || isset($details[$name])) {
//to handle custom data (checkbox) to be written
// to handle birth/deceased date, greeting_type and few other fields
- if (($name == 'birth_date') || ($name == 'deceased_date')) {
- list($defaults[$fldName]) = CRM_Utils_Date::setDateDefaults($details[$name], 'birth');
- }
- elseif (in_array($name, CRM_Contact_BAO_Contact::$_greetingTypes)) {
+ if (in_array($name, CRM_Contact_BAO_Contact::$_greetingTypes)) {
$defaults[$fldName] = $details[$name . '_id'];
$defaults[$name . '_custom'] = $details[$name . '_custom'];
}
@@ -2451,24 +2440,30 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
break;
case 'Select Date':
- // CRM-6681, set defult values according to date and time format (if any).
- $dateFormat = NULL;
- if (!empty($customFields[$customFieldId]['date_format'])) {
- $dateFormat = $customFields[$customFieldId]['date_format'];
- }
-
- if (empty($customFields[$customFieldId]['time_format'])) {
- list($defaults[$fldName]) = CRM_Utils_Date::setDateDefaults($details[$name], NULL,
- $dateFormat
- );
+ if (!in_array($name, array_keys(self::getNonUpgradedDateFields()))) {
+ $defaults[$fldName] = $details[$name];
}
else {
- $timeElement = $fldName . '_time';
- if (substr($fldName, -1) == ']') {
- $timeElement = substr($fldName, 0, -1) . '_time]';
+ // Do legacy handling.
+ // CRM-6681, set defult values according to date and time format (if any).
+ $dateFormat = NULL;
+ if (!empty($customFields[$customFieldId]['date_format'])) {
+ $dateFormat = $customFields[$customFieldId]['date_format'];
+ }
+
+ if (empty($customFields[$customFieldId]['time_format'])) {
+ list($defaults[$fldName]) = CRM_Utils_Date::setDateDefaults($details[$name], NULL,
+ $dateFormat
+ );
+ }
+ else {
+ $timeElement = $fldName . '_time';
+ if (substr($fldName, -1) == ']') {
+ $timeElement = substr($fldName, 0, -1) . '_time]';
+ }
+ list($defaults[$fldName], $defaults[$timeElement]) = CRM_Utils_Date::setDateDefaults($details[$name],
+ NULL, $dateFormat, $customFields[$customFieldId]['time_format']);
}
- list($defaults[$fldName], $defaults[$timeElement]) = CRM_Utils_Date::setDateDefaults($details[$name],
- NULL, $dateFormat, $customFields[$customFieldId]['time_format']);
}
break;
@@ -3286,17 +3281,8 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
$formattedGroupTree = array();
// @todo - as we put these on datepicker they need to be removed from here.
- $dateTimeFields = array(
- 'participant_register_date',
- 'activity_date_time',
- 'receive_date',
- 'receipt_date',
- 'cancel_date',
- 'thankyou_date',
- 'membership_start_date',
- 'membership_end_date',
- 'join_date',
- );
+ $dateTimeFields = array_keys(self::getNonUpgradedDateFields());
+
foreach ($fields as $name => $field) {
$fldName = $isStandalone ? $name : "field[$componentId][$name]";
if (in_array($name, $dateTimeFields)) {
@@ -3329,7 +3315,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
elseif ($name == 'membership_status') {
$defaults[$fldName] = $values['status_id'];
}
- elseif ($customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($name, TRUE)) {
+ elseif (CRM_Core_BAO_CustomField::getKeyID($name, TRUE) !== array(NULL, NULL)) {
if (empty($formattedGroupTree)) {
//get the groupTree as per subTypes.
$groupTree = array();
@@ -3381,6 +3367,9 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
}
}
}
+ elseif (isset($values[$fldName])) {
+ $defaults[$fldName] = $values[$fldName];
+ }
}
}
diff --git a/civicrm/CRM/Core/CodeGen/Specification.php b/civicrm/CRM/Core/CodeGen/Specification.php
index 2a94606859..be5b19b48a 100644
--- a/civicrm/CRM/Core/CodeGen/Specification.php
+++ b/civicrm/CRM/Core/CodeGen/Specification.php
@@ -463,16 +463,16 @@ class CRM_Core_CodeGen_Specification {
}
/**
- * @param $primaryXML
- * @param $fields
- * @param $table
+ * @param object $primaryXML
+ * @param array $fields
+ * @param array $table
*/
public function getPrimaryKey(&$primaryXML, &$fields, &$table) {
$name = trim((string ) $primaryXML->name);
/** need to make sure there is a field of type name */
if (!array_key_exists($name, $fields)) {
- echo "primary key $name in $table->name does not have a field definition, ignoring\n";
+ echo "primary key $name in {$table['name']} does not have a field definition, ignoring\n";
return;
}
diff --git a/civicrm/CRM/Core/DAO.php b/civicrm/CRM/Core/DAO.php
index 2c4d8992b7..4d153fb782 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -480,7 +480,7 @@ class CRM_Core_DAO extends DB_DataObject {
if ($hook) {
$event = new \Civi\Core\DAO\Event\PostUpdate($this);
- \Civi::service('dispatcher')->dispatch("DAO::post-update", $event);
+ \Civi::service('dispatcher')->dispatch("civi.dao.postUpdate", $event);
}
}
else {
@@ -488,7 +488,7 @@ class CRM_Core_DAO extends DB_DataObject {
if ($hook) {
$event = new \Civi\Core\DAO\Event\PostUpdate($this);
- \Civi::service('dispatcher')->dispatch("DAO::post-insert", $event);
+ \Civi::service('dispatcher')->dispatch("civi.dao.postInsert", $event);
}
}
$this->free();
@@ -529,7 +529,7 @@ class CRM_Core_DAO extends DB_DataObject {
$result = parent::delete($useWhere);
$event = new \Civi\Core\DAO\Event\PostDelete($this, $result);
- \Civi::service('dispatcher')->dispatch("DAO::post-delete", $event);
+ \Civi::service('dispatcher')->dispatch("civi.dao.postDelete", $event);
$this->free();
return $result;
@@ -1910,10 +1910,13 @@ SELECT contact_id
* @return bool
*/
public static function checkTriggerViewPermission($view = TRUE, $trigger = TRUE) {
+ if (\Civi::settings()->get('logging_no_trigger_permission')) {
+ return TRUE;
+ }
// test for create view and trigger permissions and if allowed, add the option to go multilingual
// and logging
// I'm not sure why we use the getStaticProperty for an error, rather than checking for DB_Error
- $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
+ CRM_Core_TemporaryErrorScope::ignoreException();
$dao = new CRM_Core_DAO();
if ($view) {
$result = $dao->query('CREATE OR REPLACE VIEW civicrm_domain_view AS SELECT * FROM civicrm_domain');
@@ -2154,6 +2157,30 @@ SELECT contact_id
}
}
+
+ /**
+ * Update the fields array to also hold keys for pseudoconstant fields that relate to contained fields.
+ *
+ * This is relevant where we want to offer both the ID field and the label field
+ * as an option, e.g. search builder.
+ *
+ * It is currently limited for optionGroupName for purposes keeping the scope of the
+ * change small, but is appropriate for other sorts of pseudoconstants.
+ *
+ * @param array $fields
+ */
+ protected static function appendPseudoConstantsToFields(&$fields) {
+ foreach ($fields as $field) {
+ if (!empty($field['pseudoconstant']) && !empty($field['pseudoconstant']['optionGroupName'])) {
+ $fields[$field['pseudoconstant']['optionGroupName']] = array(
+ 'title' => CRM_Core_BAO_OptionGroup::getTitleByName($field['pseudoconstant']['optionGroupName']),
+ 'name' => $field['pseudoconstant']['optionGroupName'],
+ 'data_type' => CRM_Utils_Type::T_STRING,
+ );
+ }
+ }
+ }
+
/**
* Get options for the called BAO object's field.
*
diff --git a/civicrm/CRM/Core/DAO/AllCoreTables.data.php b/civicrm/CRM/Core/DAO/AllCoreTables.data.php
index 7ca1c70776..c95dfbfe6c 100644
--- a/civicrm/CRM/Core/DAO/AllCoreTables.data.php
+++ b/civicrm/CRM/Core/DAO/AllCoreTables.data.php
@@ -24,7 +24,7 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
-// (GenCodeChecksum:9f38a12c446ece781c1ef9c46dd95a5d)
+// (GenCodeChecksum:2d00b723ca52ca6cb6e6ce01e51cd673)
return array(
'CRM_Core_DAO_AddressFormat' => array(
'name' => 'AddressFormat',
diff --git a/civicrm/CRM/Core/DAO/permissions.php b/civicrm/CRM/Core/DAO/permissions.php
index d42f29c6d5..e74ff526e5 100644
--- a/civicrm/CRM/Core/DAO/permissions.php
+++ b/civicrm/CRM/Core/DAO/permissions.php
@@ -39,557 +39,7 @@ function _civicrm_api3_permissions($entity, $action, &$params) {
// FIXME: Lowercase entity_names are nonstandard but difficult to fix here
// because this function invokes hook_civicrm_alterAPIPermissions
$entity = _civicrm_api_get_entity_name_from_camel($entity);
-
- /**
- * @var array of permissions
- *
- * For each entity, we declare an array of permissions required for each action
- * The action is the array key, possible values:
- * * create: applies to create (with no id in params)
- * * update: applies to update, setvalue, create (with id in params)
- * * get: applies to getcount, getsingle, getvalue and other gets
- * * delete: applies to delete, replace
- * * meta: applies to getfields, getoptions, getspec
- * * default: catch-all for anything not declared
- *
- * Note: some APIs declare other actions as well
- *
- * Permissions should use arrays for AND and arrays of arrays for OR
- * @see CRM_Core_Permission::check for more documentation
- */
- $permissions = array();
-
- // These are the default permissions - if any entity does not declare permissions for a given action,
- // (or the entity does not declare permissions at all) - then the action will be used from here
- $permissions['default'] = array(
- // applies to getfields, getoptions, etc.
- 'meta' => array('access CiviCRM'),
- // catch-all, applies to create, get, delete, etc.
- // If an entity declares it's own 'default' action it will override this one
- 'default' => array('administer CiviCRM'),
- );
-
- // Note: Additional permissions in DynamicFKAuthorization
- $permissions['attachment'] = array(
- 'default' => array(
- array('access CiviCRM', 'access AJAX API'),
- ),
- );
-
- // Contact permissions
- $permissions['contact'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'add contacts',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'delete contacts',
- ),
- // managed by query object
- 'get' => array(),
- // managed by _civicrm_api3_check_edit_permissions
- 'update' => array(),
- 'getquick' => array(
- array('access CiviCRM', 'access AJAX API'),
- ),
- );
-
- // CRM-16963 - Permissions for country.
- $permissions['country'] = array(
- 'get' => array(
- 'access CiviCRM',
- ),
- 'default' => array(
- 'administer CiviCRM',
- ),
- );
-
- // Contact-related data permissions.
- $permissions['address'] = array(
- // get is managed by BAO::addSelectWhereClause
- // create/delete are managed by _civicrm_api3_check_edit_permissions
- 'default' => array(),
- );
- $permissions['email'] = $permissions['address'];
- $permissions['phone'] = $permissions['address'];
- $permissions['website'] = $permissions['address'];
- $permissions['im'] = $permissions['address'];
- $permissions['open_i_d'] = $permissions['address'];
-
- // Also managed by ACLs - CRM-19448
- $permissions['entity_tag'] = array('default' => array());
- $permissions['note'] = $permissions['entity_tag'];
-
- // Allow non-admins to get and create tags to support tagset widget
- // Delete is still reserved for admins
- $permissions['tag'] = array(
- 'get' => array('access CiviCRM'),
- 'create' => array('access CiviCRM'),
- 'update' => array('access CiviCRM'),
- );
-
- //relationship permissions
- $permissions['relationship'] = array(
- // get is managed by BAO::addSelectWhereClause
- 'get' => array(),
- 'delete' => array(
- 'access CiviCRM',
- 'edit all contacts',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'edit all contacts',
- ),
- );
-
- // CRM-17741 - Permissions for RelationshipType.
- $permissions['relationship_type'] = array(
- 'get' => array(
- 'access CiviCRM',
- ),
- 'default' => array(
- 'administer CiviCRM',
- ),
- );
-
- // Activity permissions
- $permissions['activity'] = array(
- 'delete' => array(
- 'access CiviCRM',
- 'delete activities',
- ),
- 'get' => array(
- 'access CiviCRM',
- // Note that view all activities is also required within the api
- // if the id is not passed in. Where the id is passed in the activity
- // specific check functions are used and tested.
- ),
- 'default' => array(
- 'access CiviCRM',
- 'view all activities',
- ),
- );
-
- // Case permissions
- $permissions['case'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'add cases',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'delete in CiviCase',
- ),
- 'default' => array(
- // At minimum the user needs one of the following. Finer-grained access is controlled by CRM_Case_BAO_Case::addSelectWhereClause
- array('access my cases and activities', 'access all cases and activities'),
- ),
- );
- $permissions['case_contact'] = $permissions['case'];
-
- $permissions['case_type'] = array(
- 'default' => array('administer CiviCase'),
- 'get' => array(
- // nested array = OR
- array('access my cases and activities', 'access all cases and activities'),
- ),
- );
-
- // Campaign permissions
- $permissions['campaign'] = array(
- 'get' => array('access CiviCRM'),
- 'default' => array(
- // nested array = OR
- array('administer CiviCampaign', 'manage campaign'),
- ),
- );
- $permissions['survey'] = $permissions['campaign'];
-
- // Financial permissions
- $permissions['contribution'] = array(
- 'get' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'delete in CiviContribute',
- ),
- 'completetransaction' => array(
- 'edit contributions',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'edit contributions',
- ),
- );
- $permissions['line_item'] = $permissions['contribution'];
-
- // Payment permissions
- $permissions['payment'] = array(
- 'get' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'delete in CiviContribute',
- ),
- 'cancel' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'edit contributions',
- ),
- 'create' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'edit contributions',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'access CiviContribute',
- 'edit contributions',
- ),
- );
-
- // Custom field permissions
- $permissions['custom_field'] = array(
- 'default' => array(
- 'administer CiviCRM',
- 'access all custom data',
- ),
- );
- $permissions['custom_group'] = $permissions['custom_field'];
-
- // Event permissions
- $permissions['event'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit all events',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'delete in CiviEvent',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'view event info',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit all events',
- ),
- );
- // Loc block is only used for events
- $permissions['loc_block'] = $permissions['event'];
-
- // Price sets are shared by several components, user needs access to at least one of them
- $permissions['price_set'] = array(
- 'default' => array(
- array('access CiviEvent', 'access CiviContribute', 'access CiviMember'),
- ),
- 'get' => array(
- array('access CiviCRM', 'view event info', 'make online contributions'),
- ),
- );
-
- // File permissions
- $permissions['file'] = array(
- 'default' => array(
- 'access CiviCRM',
- 'access uploaded files',
- ),
- );
- $permissions['files_by_entity'] = $permissions['file'];
-
- // Group permissions
- $permissions['group'] = array(
- 'get' => array(
- 'access CiviCRM',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'edit groups',
- ),
- );
-
- $permissions['group_nesting'] = $permissions['group'];
- $permissions['group_organization'] = $permissions['group'];
-
- //Group Contact permission
- $permissions['group_contact'] = array(
- 'get' => array(
- 'access CiviCRM',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'edit all contacts',
- ),
- );
-
- // CiviMail Permissions
- $civiMailBasePerms = array(
- // To get/preview/update, one must have least one of these perms:
- // Mailing API implementations enforce nuances of create/approve/schedule permissions.
- 'access CiviMail',
- 'create mailings',
- 'schedule mailings',
- 'approve mailings',
- );
- $permissions['mailing'] = array(
- 'get' => array(
- 'access CiviCRM',
- $civiMailBasePerms,
- ),
- 'delete' => array(
- 'access CiviCRM',
- $civiMailBasePerms,
- 'delete in CiviMail',
- ),
- 'submit' => array(
- 'access CiviCRM',
- array('access CiviMail', 'schedule mailings'),
- ),
- 'default' => array(
- 'access CiviCRM',
- $civiMailBasePerms,
- ),
- );
- $permissions['mailing_group'] = $permissions['mailing'];
- $permissions['mailing_job'] = $permissions['mailing'];
- $permissions['mailing_recipients'] = $permissions['mailing'];
-
- $permissions['mailing_a_b'] = array(
- 'get' => array(
- 'access CiviCRM',
- 'access CiviMail',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviMail',
- 'delete in CiviMail',
- ),
- 'submit' => array(
- 'access CiviCRM',
- array('access CiviMail', 'schedule mailings'),
- ),
- 'default' => array(
- 'access CiviCRM',
- 'access CiviMail',
- ),
- );
-
- // Membership permissions
- $permissions['membership'] = array(
- 'get' => array(
- 'access CiviCRM',
- 'access CiviMember',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'delete in CiviMember',
- ),
- 'default' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'edit memberships',
- ),
- );
- $permissions['membership_status'] = $permissions['membership'];
- $permissions['membership_type'] = $permissions['membership'];
- $permissions['membership_payment'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'edit memberships',
- 'access CiviContribute',
- 'edit contributions',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'delete in CiviMember',
- 'access CiviContribute',
- 'delete in CiviContribute',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'access CiviContribute',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviMember',
- 'edit memberships',
- 'access CiviContribute',
- 'edit contributions',
- ),
- );
-
- // Participant permissions
- $permissions['participant'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'register for events',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit event participants',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'view event participants',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit event participants',
- ),
- );
- $permissions['participant_payment'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'register for events',
- 'access CiviContribute',
- 'edit contributions',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit event participants',
- 'access CiviContribute',
- 'delete in CiviContribute',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'view event participants',
- 'access CiviContribute',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviEvent',
- 'edit event participants',
- 'access CiviContribute',
- 'edit contributions',
- ),
- );
-
- // Pledge permissions
- $permissions['pledge'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'edit pledges',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'delete in CiviPledge',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'edit pledges',
- ),
- );
-
- //CRM-16777: Disable schedule reminder for user that have 'edit all events' and 'administer CiviCRM' permission.
- $permissions['action_schedule'] = array(
- 'update' => array(
- array(
- 'access CiviCRM',
- 'edit all events',
- ),
- ),
- );
-
- $permissions['pledge_payment'] = array(
- 'create' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'edit pledges',
- 'access CiviContribute',
- 'edit contributions',
- ),
- 'delete' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'delete in CiviPledge',
- 'access CiviContribute',
- 'delete in CiviContribute',
- ),
- 'get' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'access CiviContribute',
- ),
- 'update' => array(
- 'access CiviCRM',
- 'access CiviPledge',
- 'edit pledges',
- 'access CiviContribute',
- 'edit contributions',
- ),
- );
-
- // Profile permissions
- $permissions['profile'] = array(
- 'get' => array(), // the profile will take care of this
- );
-
- $permissions['uf_group'] = array(
- 'create' => array(
- 'access CiviCRM',
- array(
- 'administer CiviCRM',
- 'manage event profiles',
- ),
- ),
- 'get' => array(
- 'access CiviCRM',
- ),
- 'update' => array(
- 'access CiviCRM',
- array(
- 'administer CiviCRM',
- 'manage event profiles',
- ),
- ),
- );
- $permissions['uf_field'] = $permissions['uf_join'] = $permissions['uf_group'];
- $permissions['uf_field']['delete'] = array(
- 'access CiviCRM',
- array(
- 'administer CiviCRM',
- 'manage event profiles',
- ),
- );
- $permissions['option_value'] = $permissions['uf_group'];
- $permissions['option_group'] = $permissions['option_value'];
-
- $permissions['message_template'] = array(
- 'get' => array('access CiviCRM'),
- 'create' => array('edit message templates'),
- 'update' => array('edit message templates'),
- );
+ $permissions = CRM_Core_Permission::getEntityActionPermissions();
// Translate 'create' action to 'update' if id is set
if ($action == 'create' && (!empty($params['id']) || !empty($params[$entity . '_id']))) {
@@ -608,23 +58,8 @@ function _civicrm_api3_permissions($entity, $action, &$params) {
}
// Translate specific actions into their generic equivalents
- $snippet = substr($action, 0, 3);
- if ($action == 'replace' || $snippet == 'del') {
- // 'Replace' is a combination of get+create+update+delete; however, the permissions
- // on each of those will be tested separately at runtime. This is just a sniff-test
- // based on the heuristic that 'delete' tends to be the most closely guarded
- // of the necessary permissions.
- $action = 'delete';
- }
- elseif ($action == 'setvalue' || $snippet == 'upd') {
- $action = 'update';
- }
- elseif ($action == 'getfields' || $action == 'getfield' || $action == 'getspec' || $action == 'getoptions') {
- $action = 'meta';
- }
- elseif ($snippet == 'get') {
- $action = 'get';
- }
+ $action = CRM_Core_Permission::getGenericAction($action);
+
return isset($perm[$action]) ? $perm[$action] : $perm['default'];
}
diff --git a/civicrm/CRM/Core/Error.php b/civicrm/CRM/Core/Error.php
index 81b470bbc0..1d2b465ca9 100644
--- a/civicrm/CRM/Core/Error.php
+++ b/civicrm/CRM/Core/Error.php
@@ -605,7 +605,15 @@ class CRM_Core_Error extends PEAR_ErrorStack {
}
$file_log->close();
- if (!empty($config->userFrameworkLogging)) {
+ if (!isset(\Civi::$statics[__CLASS__]['userFrameworkLogging'])) {
+ // Set it to FALSE first & then try to set it. This is to prevent a loop as calling
+ // $config->userFrameworkLogging can trigger DB queries & under log mode this
+ // then gets called again.
+ \Civi::$statics[__CLASS__]['userFrameworkLogging'] = FALSE;
+ \Civi::$statics[__CLASS__]['userFrameworkLogging'] = $config->userFrameworkLogging;
+ }
+
+ if (!empty(\Civi::$statics[__CLASS__]['userFrameworkLogging'])) {
// should call $config->userSystem->logger($message) here - but I got a situation where userSystem was not an object - not sure why
if ($config->userSystem->is_drupal and function_exists('watchdog')) {
watchdog('civicrm', '%message', array('%message' => $message), WATCHDOG_DEBUG);
diff --git a/civicrm/CRM/Core/Form.php b/civicrm/CRM/Core/Form.php
index 68d4ceabea..3c64bf060d 100644
--- a/civicrm/CRM/Core/Form.php
+++ b/civicrm/CRM/Core/Form.php
@@ -1251,7 +1251,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
if ($action & (CRM_Core_Action::UPDATE + CRM_Core_Action::ADD)) {
return 'create';
}
- if ($action & (CRM_Core_Action::BROWSE + CRM_Core_Action::BASIC + CRM_Core_Action::ADVANCED + CRM_Core_Action::PREVIEW)) {
+ if ($action & (CRM_Core_Action::VIEW + CRM_Core_Action::BROWSE + CRM_Core_Action::BASIC + CRM_Core_Action::ADVANCED + CRM_Core_Action::PREVIEW)) {
return 'get';
}
// If you get this exception try adding more cases above.
@@ -1366,11 +1366,16 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
* - multiple - bool
* - context - @see CRM_Core_DAO::buildOptionsContext
* @param bool $required
+ * @param bool $legacyDate
+ * Temporary param to facilitate the conversion of fields to use the datepicker in
+ * a controlled way. To convert the field the jcalendar code needs to be removed from the
+ * tpl as well. That file is intended to be EOL.
+ *
* @throws \CiviCRM_API3_Exception
* @throws \Exception
* @return HTML_QuickForm_Element
*/
- public function addField($name, $props = array(), $required = FALSE) {
+ public function addField($name, $props = array(), $required = FALSE, $legacyDate = TRUE) {
// Resolve context.
if (empty($props['context'])) {
$props['context'] = $this->getDefaultContext();
@@ -1455,10 +1460,19 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
return $this->add('textarea', $name, $label, $props, $required);
case 'Select Date':
- //TODO: add range support
- //TODO: Add date formats
- //TODO: Add javascript template for dates.
- return $this->addDate($name, $label, $required, $props);
+ // This is a white list for fields that have been tested with
+ // date picker. We should be able to remove the other
+ if ($legacyDate) {
+ //TODO: add range support
+ //TODO: Add date formats
+ //TODO: Add javascript template for dates.
+ return $this->addDate($name, $label, $required, $props);
+ }
+ else {
+ $fieldSpec = CRM_Utils_Date::addDateMetadataToField($fieldSpec, $fieldSpec);
+ $attributes = array('format' => $fieldSpec['date_format']);
+ return $this->add('datepicker', $name, $label, $attributes, $required, $fieldSpec['datepicker']['extra']);
+ }
case 'Radio':
$separator = isset($props['separator']) ? $props['separator'] : NULL;
diff --git a/civicrm/CRM/Core/Page.php b/civicrm/CRM/Core/Page.php
index 4167e81023..fe0f2b0732 100644
--- a/civicrm/CRM/Core/Page.php
+++ b/civicrm/CRM/Core/Page.php
@@ -406,4 +406,28 @@ class CRM_Core_Page {
$this->$name = $value;
}
+ /**
+ * Assign metadata about fields to the template.
+ *
+ * In order to allow the template to format fields we assign information about them to the template.
+ *
+ * At this stage only date field metadata is assigned as that is the only use-case in play and
+ * we don't want to assign a lot of unneeded data.
+ *
+ * @param string $entity
+ * The entity being queried.
+ *
+ * @throws \CiviCRM_API3_Exception
+ */
+ protected function assignFieldMetadataToTemplate($entity) {
+ $fields = civicrm_api3($entity, 'getfields', array('action' => 'get'));
+ $dateFields = array();
+ foreach ($fields['values'] as $fieldName => $fieldMetaData) {
+ if (isset($fieldMetaData['html']) && CRM_Utils_Array::value('type', $fieldMetaData['html']) == 'Select Date') {
+ $dateFields[$fieldName] = CRM_Utils_Date::addDateMetadataToField($fieldMetaData, $fieldMetaData);
+ }
+ }
+ $this->assign('fields', $dateFields);
+ }
+
}
diff --git a/civicrm/CRM/Core/Payment.php b/civicrm/CRM/Core/Payment.php
index d87e378ace..7d08cbd2b0 100644
--- a/civicrm/CRM/Core/Payment.php
+++ b/civicrm/CRM/Core/Payment.php
@@ -412,6 +412,42 @@ abstract class CRM_Core_Payment {
return $this->_paymentForm;
}
+ /**
+ * Get help text information (help, description, etc.) about this payment,
+ * to display to the user.
+ *
+ * @param string $context
+ * Context of the text.
+ * Only explicitly supported contexts are handled without error.
+ * Currently supported:
+ * - contributionPageRecurringHelp (params: is_recur_installments, is_email_receipt)
+ *
+ * @param array $params
+ * Parameters for the field, context specific.
+ *
+ * @return string
+ */
+ public function getText($context, $params) {
+ // I have deliberately added a noisy fail here.
+ // The function is intended to be extendable, but not by changes
+ // not documented clearly above.
+ switch ($context) {
+ case 'contributionPageRecurringHelp':
+ // require exactly two parameters
+ if (array_keys($params) == array('is_recur_installments', 'is_email_receipt')) {
+ $gotText = ts('Your recurring contribution will be processed automatically.');
+ if ($params['is_recur_installments']) {
+ $gotText .= ts(' You can specify the number of installments, or you can leave the number of installments blank if you want to make an open-ended commitment. In either case, you can choose to cancel at any time.');
+ }
+ if ($params['is_email_receipt']) {
+ $gotText .= ts(' You will receive an email receipt for each recurring contribution.');
+ }
+ }
+ break;
+ }
+ return $gotText;
+ }
+
/**
* Getter for accessing member vars.
*
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNet.php b/civicrm/CRM/Core/Payment/AuthorizeNet.php
index 2dd73da5f8..2cca544ad0 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNet.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNet.php
@@ -187,7 +187,8 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment {
case self::AUTH_ERROR:
$params['payment_status_id'] = array_search('Failed', $contributionStatus);
- break;
+ $errormsg = $response_fields[2] . ' ' . $response_fields[3];
+ return self::error($response_fields[1], $errormsg);
case self::AUTH_DECLINED:
$errormsg = $response_fields[2] . ' ' . $response_fields[3];
diff --git a/civicrm/CRM/Core/Payment/BaseIPN.php b/civicrm/CRM/Core/Payment/BaseIPN.php
index 4a3d25f677..d1bbb00cba 100644
--- a/civicrm/CRM/Core/Payment/BaseIPN.php
+++ b/civicrm/CRM/Core/Payment/BaseIPN.php
@@ -471,10 +471,10 @@ class CRM_Core_Payment_BaseIPN {
}
/**
- * Send receipt from contribution.
- *
* @deprecated
*
+ * @todo confirm this function is not being used by any payment processor outside core & remove.
+ *
* Note that the compose message part has been moved to contribution
* In general LoadObjects is called first to get the objects but the composeMessageArray function now calls it
*
@@ -494,7 +494,7 @@ class CRM_Core_Payment_BaseIPN {
* @return array
*/
public function sendMail(&$input, &$ids, &$objects, &$values, $recur = FALSE, $returnMessageText = FALSE) {
- return CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution']->id, $values, $recur,
+ return CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution']->id, $values,
$returnMessageText);
}
diff --git a/civicrm/CRM/Core/Permission.php b/civicrm/CRM/Core/Permission.php
index c5307c9e85..826d70a284 100644
--- a/civicrm/CRM/Core/Permission.php
+++ b/civicrm/CRM/Core/Permission.php
@@ -874,6 +874,589 @@ class CRM_Core_Permission {
return $permissions;
}
+ /**
+ * For each entity provides an array of permissions required for each action
+ *
+ * The action is the array key, possible values:
+ * * create: applies to create (with no id in params)
+ * * update: applies to update, setvalue, create (with id in params)
+ * * get: applies to getcount, getsingle, getvalue and other gets
+ * * delete: applies to delete, replace
+ * * meta: applies to getfields, getoptions, getspec
+ * * default: catch-all for anything not declared
+ *
+ * Note: some APIs declare other actions as well
+ *
+ * Permissions should use arrays for AND and arrays of arrays for OR
+ * @see CRM_Core_Permission::check
+ *
+ * @return array of permissions
+ */
+ public static function getEntityActionPermissions() {
+ $permissions = array();
+ // These are the default permissions - if any entity does not declare permissions for a given action,
+ // (or the entity does not declare permissions at all) - then the action will be used from here
+ $permissions['default'] = array(
+ // applies to getfields, getoptions, etc.
+ 'meta' => array('access CiviCRM'),
+ // catch-all, applies to create, get, delete, etc.
+ // If an entity declares it's own 'default' action it will override this one
+ 'default' => array('administer CiviCRM'),
+ );
+
+ // Note: Additional permissions in DynamicFKAuthorization
+ $permissions['attachment'] = array(
+ 'default' => array(
+ array('access CiviCRM', 'access AJAX API'),
+ ),
+ );
+
+ // Contact permissions
+ $permissions['contact'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'add contacts',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'delete contacts',
+ ),
+ // managed by query object
+ 'get' => array(),
+ // managed by _civicrm_api3_check_edit_permissions
+ 'update' => array(),
+ 'getquick' => array(
+ array('access CiviCRM', 'access AJAX API'),
+ ),
+ );
+
+ // CRM-16963 - Permissions for country.
+ $permissions['country'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ ),
+ 'default' => array(
+ 'administer CiviCRM',
+ ),
+ );
+
+ // Contact-related data permissions.
+ $permissions['address'] = array(
+ // get is managed by BAO::addSelectWhereClause
+ // create/delete are managed by _civicrm_api3_check_edit_permissions
+ 'default' => array(),
+ );
+ $permissions['email'] = $permissions['address'];
+ $permissions['phone'] = $permissions['address'];
+ $permissions['website'] = $permissions['address'];
+ $permissions['im'] = $permissions['address'];
+ $permissions['open_i_d'] = $permissions['address'];
+
+ // Also managed by ACLs - CRM-19448
+ $permissions['entity_tag'] = array('default' => array());
+ $permissions['note'] = $permissions['entity_tag'];
+
+ // Allow non-admins to get and create tags to support tagset widget
+ // Delete is still reserved for admins
+ $permissions['tag'] = array(
+ 'get' => array('access CiviCRM'),
+ 'create' => array('access CiviCRM'),
+ 'update' => array('access CiviCRM'),
+ );
+
+ //relationship permissions
+ $permissions['relationship'] = array(
+ // get is managed by BAO::addSelectWhereClause
+ 'get' => array(),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'edit all contacts',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'edit all contacts',
+ ),
+ );
+
+ // CRM-17741 - Permissions for RelationshipType.
+ $permissions['relationship_type'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ ),
+ 'default' => array(
+ 'administer CiviCRM',
+ ),
+ );
+
+ // Activity permissions
+ $permissions['activity'] = array(
+ 'delete' => array(
+ 'access CiviCRM',
+ 'delete activities',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ // Note that view all activities is also required within the api
+ // if the id is not passed in. Where the id is passed in the activity
+ // specific check functions are used and tested.
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'view all activities',
+ ),
+ );
+
+ // Case permissions
+ $permissions['case'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'add cases',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'delete in CiviCase',
+ ),
+ 'default' => array(
+ // At minimum the user needs one of the following. Finer-grained access is controlled by CRM_Case_BAO_Case::addSelectWhereClause
+ array('access my cases and activities', 'access all cases and activities'),
+ ),
+ );
+ $permissions['case_contact'] = $permissions['case'];
+
+ $permissions['case_type'] = array(
+ 'default' => array('administer CiviCase'),
+ 'get' => array(
+ // nested array = OR
+ array('access my cases and activities', 'access all cases and activities'),
+ ),
+ );
+
+ // Campaign permissions
+ $permissions['campaign'] = array(
+ 'get' => array('access CiviCRM'),
+ 'default' => array(
+ // nested array = OR
+ array('administer CiviCampaign', 'manage campaign'),
+ ),
+ );
+ $permissions['survey'] = $permissions['campaign'];
+
+ // Financial permissions
+ $permissions['contribution'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'delete in CiviContribute',
+ ),
+ 'completetransaction' => array(
+ 'edit contributions',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ );
+ $permissions['line_item'] = $permissions['contribution'];
+
+ // Payment permissions
+ $permissions['payment'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'delete in CiviContribute',
+ ),
+ 'cancel' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ );
+
+ // Custom field permissions
+ $permissions['custom_field'] = array(
+ 'default' => array(
+ 'administer CiviCRM',
+ 'access all custom data',
+ ),
+ );
+ $permissions['custom_group'] = $permissions['custom_field'];
+
+ // Event permissions
+ $permissions['event'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit all events',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'delete in CiviEvent',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'view event info',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit all events',
+ ),
+ );
+ // Loc block is only used for events
+ $permissions['loc_block'] = $permissions['event'];
+
+ // Price sets are shared by several components, user needs access to at least one of them
+ $permissions['price_set'] = array(
+ 'default' => array(
+ array('access CiviEvent', 'access CiviContribute', 'access CiviMember'),
+ ),
+ 'get' => array(
+ array('access CiviCRM', 'view event info', 'make online contributions'),
+ ),
+ );
+
+ // File permissions
+ $permissions['file'] = array(
+ 'default' => array(
+ 'access CiviCRM',
+ 'access uploaded files',
+ ),
+ );
+ $permissions['files_by_entity'] = $permissions['file'];
+
+ // Group permissions
+ $permissions['group'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'edit groups',
+ ),
+ );
+
+ $permissions['group_nesting'] = $permissions['group'];
+ $permissions['group_organization'] = $permissions['group'];
+
+ //Group Contact permission
+ $permissions['group_contact'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'edit all contacts',
+ ),
+ );
+
+ // CiviMail Permissions
+ $civiMailBasePerms = array(
+ // To get/preview/update, one must have least one of these perms:
+ // Mailing API implementations enforce nuances of create/approve/schedule permissions.
+ 'access CiviMail',
+ 'create mailings',
+ 'schedule mailings',
+ 'approve mailings',
+ );
+ $permissions['mailing'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ $civiMailBasePerms,
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ $civiMailBasePerms,
+ 'delete in CiviMail',
+ ),
+ 'submit' => array(
+ 'access CiviCRM',
+ array('access CiviMail', 'schedule mailings'),
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ $civiMailBasePerms,
+ ),
+ );
+ $permissions['mailing_group'] = $permissions['mailing'];
+ $permissions['mailing_job'] = $permissions['mailing'];
+ $permissions['mailing_recipients'] = $permissions['mailing'];
+
+ $permissions['mailing_a_b'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviMail',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviMail',
+ 'delete in CiviMail',
+ ),
+ 'submit' => array(
+ 'access CiviCRM',
+ array('access CiviMail', 'schedule mailings'),
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'access CiviMail',
+ ),
+ );
+
+ // Membership permissions
+ $permissions['membership'] = array(
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'delete in CiviMember',
+ ),
+ 'default' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'edit memberships',
+ ),
+ );
+ $permissions['membership_status'] = $permissions['membership'];
+ $permissions['membership_type'] = $permissions['membership'];
+ $permissions['membership_payment'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'edit memberships',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'delete in CiviMember',
+ 'access CiviContribute',
+ 'delete in CiviContribute',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'access CiviContribute',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviMember',
+ 'edit memberships',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ );
+
+ // Participant permissions
+ $permissions['participant'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'register for events',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit event participants',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'view event participants',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit event participants',
+ ),
+ );
+ $permissions['participant_payment'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'register for events',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit event participants',
+ 'access CiviContribute',
+ 'delete in CiviContribute',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'view event participants',
+ 'access CiviContribute',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviEvent',
+ 'edit event participants',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ );
+
+ // Pledge permissions
+ $permissions['pledge'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'edit pledges',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'delete in CiviPledge',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'edit pledges',
+ ),
+ );
+
+ //CRM-16777: Disable schedule reminder for user that have 'edit all events' and 'administer CiviCRM' permission.
+ $permissions['action_schedule'] = array(
+ 'update' => array(
+ array(
+ 'access CiviCRM',
+ 'edit all events',
+ ),
+ ),
+ );
+
+ $permissions['pledge_payment'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'edit pledges',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ 'delete' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'delete in CiviPledge',
+ 'access CiviContribute',
+ 'delete in CiviContribute',
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'access CiviContribute',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ 'access CiviPledge',
+ 'edit pledges',
+ 'access CiviContribute',
+ 'edit contributions',
+ ),
+ );
+
+ // Profile permissions
+ $permissions['profile'] = array(
+ 'get' => array(), // the profile will take care of this
+ );
+
+ $permissions['uf_group'] = array(
+ 'create' => array(
+ 'access CiviCRM',
+ array(
+ 'administer CiviCRM',
+ 'manage event profiles',
+ ),
+ ),
+ 'get' => array(
+ 'access CiviCRM',
+ ),
+ 'update' => array(
+ 'access CiviCRM',
+ array(
+ 'administer CiviCRM',
+ 'manage event profiles',
+ ),
+ ),
+ );
+ $permissions['uf_field'] = $permissions['uf_join'] = $permissions['uf_group'];
+ $permissions['uf_field']['delete'] = array(
+ 'access CiviCRM',
+ array(
+ 'administer CiviCRM',
+ 'manage event profiles',
+ ),
+ );
+ $permissions['option_value'] = $permissions['uf_group'];
+ $permissions['option_group'] = $permissions['option_value'];
+
+ $permissions['message_template'] = array(
+ 'get' => array('access CiviCRM'),
+ 'create' => array('edit message templates'),
+ 'update' => array('edit message templates'),
+ );
+ return $permissions;
+ }
+
+ /**
+ * Translate an unknown action to a canonical form.
+ *
+ * @param string $action
+ *
+ * @return string
+ * the standardised action name
+ */
+ public static function getGenericAction($action) {
+ $snippet = substr($action, 0, 3);
+ if ($action == 'replace' || $snippet == 'del') {
+ // 'Replace' is a combination of get+create+update+delete; however, the permissions
+ // on each of those will be tested separately at runtime. This is just a sniff-test
+ // based on the heuristic that 'delete' tends to be the most closely guarded
+ // of the necessary permissions.
+ $action = 'delete';
+ }
+ elseif ($action == 'setvalue' || $snippet == 'upd') {
+ $action = 'update';
+ }
+ elseif ($action == 'getfields' || $action == 'getfield' || $action == 'getspec' || $action == 'getoptions') {
+ $action = 'meta';
+ }
+ elseif ($snippet == 'get') {
+ $action = 'get';
+ }
+ return $action;
+ }
+
/**
* Validate user permission across.
* edit or view or with supportable acls.
diff --git a/civicrm/CRM/Core/Reference/Basic.php b/civicrm/CRM/Core/Reference/Basic.php
index 411d30627b..797d5832ab 100644
--- a/civicrm/CRM/Core/Reference/Basic.php
+++ b/civicrm/CRM/Core/Reference/Basic.php
@@ -78,11 +78,16 @@ class CRM_Core_Reference_Basic implements CRM_Core_Reference_Interface {
*/
public function findReferences($targetDao) {
$targetColumn = $this->getTargetKey();
+ $select = 'id';
+ // CRM-19385: Since id is removed, return all rows for cache tables.
+ if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($this->getReferenceTable(), 'id')) {
+ $select = '*';
+ }
$params = array(
1 => array($targetDao->$targetColumn, 'String'),
);
$sql = <<<EOS
-SELECT id
+SELECT {$select}
FROM {$this->getReferenceTable()}
WHERE {$this->getReferenceKey()} = %1
EOS;
@@ -103,7 +108,7 @@ EOS;
1 => array($targetDao->$targetColumn, 'String'),
);
$sql = <<<EOS
-SELECT count(id)
+SELECT count(*)
FROM {$this->getReferenceTable()}
WHERE {$this->getReferenceKey()} = %1
EOS;
diff --git a/civicrm/CRM/Core/Resources.php b/civicrm/CRM/Core/Resources.php
index 52815a69f7..e145938d16 100644
--- a/civicrm/CRM/Core/Resources.php
+++ b/civicrm/CRM/Core/Resources.php
@@ -500,7 +500,7 @@ class CRM_Core_Resources {
$file = '';
}
if ($addCacheCode) {
- $file .= '?r=' . $this->getCacheCode();
+ $file = $this->addCacheCode($file);
}
// TODO consider caching results
$base = $this->paths->hasVariable($ext)
@@ -643,7 +643,8 @@ class CRM_Core_Resources {
// Load custom or core css
$config = CRM_Core_Config::singleton();
if (!empty($config->customCSSURL)) {
- $this->addStyleUrl($config->customCSSURL, 99, $region);
+ $customCSSURL = $this->addCacheCode($config->customCSSURL);
+ $this->addStyleUrl($customCSSURL, 99, $region);
}
if (!Civi::settings()->get('disable_core_css')) {
$this->addStyleFile('civicrm', 'css/civicrm.css', -99, $region);
@@ -740,9 +741,7 @@ class CRM_Core_Resources {
$items[] = "packages/jquery/plugins/jquery.tableHeader.js";
$items[] = "packages/jquery/plugins/jquery.menu.min.js";
$items[] = "css/civicrmNavigation.css";
- $items[] = "packages/jquery/plugins/jquery.jeditable.min.js";
$items[] = "packages/jquery/plugins/jquery.notify.min.js";
- $items[] = "js/jquery/jquery.crmeditable.js";
}
// JS for multilingual installations
@@ -883,4 +882,15 @@ class CRM_Core_Resources {
}
}
+ /**
+ * @param string $url
+ * @return string
+ */
+ public function addCacheCode($url) {
+ $hasQuery = strpos($url, '?') !== FALSE;
+ $operator = $hasQuery ? '&' : '?';
+
+ return $url . $operator . 'r=' . $this->cacheCode;
+ }
+
}
diff --git a/civicrm/CRM/Core/SelectValues.php b/civicrm/CRM/Core/SelectValues.php
index 344219ef5a..22416b15d2 100644
--- a/civicrm/CRM/Core/SelectValues.php
+++ b/civicrm/CRM/Core/SelectValues.php
@@ -343,13 +343,14 @@ class CRM_Core_SelectValues {
if (empty($date['format'])) {
if ($context == 'Input') {
$date['format'] = Civi::settings()->get('dateInputFormat');
- $date['php_datetime_format'] = self::datePluginToPHPFormats(Civi::settings()->get('dateInputFormat'));
}
else {
$date['format'] = 'M d';
}
}
}
+
+ $date['smarty_view_format'] = CRM_Utils_Date::getDateFieldViewFormat($date['format']);
if (!isset($date['time'])) {
$date['time'] = FALSE;
}
@@ -762,32 +763,6 @@ class CRM_Core_SelectValues {
return $dateInputFormats;
}
- /**
- * Map date plugin and actual format that is used by PHP.
- *
- * @return array
- */
- public static function datePluginToPHPFormats() {
- $dateInputFormats = array(
- "mm/dd/yy" => 'm/d/Y',
- "dd/mm/yy" => 'd/m/Y',
- "yy-mm-dd" => 'Y-m-d',
- "dd-mm-yy" => 'd-m-Y',
- "dd.mm.yy" => 'd.m.Y',
- "M d, yy" => 'M j, Y',
- "d M yy" => 'j M Y',
- "MM d, yy" => 'F j, Y',
- "d MM yy" => 'j F Y',
- "DD, d MM yy" => 'l, j F Y',
- "mm/dd" => 'm/d',
- "dd-mm" => 'd-m',
- "yy-mm" => 'Y-m',
- "M yy" => 'M Y',
- "yy" => 'Y',
- );
- return $dateInputFormats;
- }
-
/**
* Time formats.
*
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
index b38e7f3c67..3f5f6b6fb8 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
@@ -56,6 +56,9 @@ function smarty_function_crmStyle($params, &$smarty) {
if (empty($params['region'])) {
$params['region'] = CRM_Core_Resources::DEFAULT_REGION;
}
+ if (empty($params['ext'])) {
+ $params['ext'] = 'civicrm';
+ }
if (array_key_exists('file', $params)) {
$res->addStyleFile($params['ext'], $params['file'], $params['weight'], $params['region']);
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
index 8e2afb6a59..11b001abd7 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
@@ -56,10 +56,6 @@ function smarty_modifier_crmDate($dateString, $dateFormat = NULL, $onlyTime = FA
$config = CRM_Core_Config::singleton();
$dateFormat = $config->dateformatTime;
}
- // Handle possibility we only have a date function style date format.
- if ($dateFormat && !stristr($dateFormat, '%')) {
- return date($dateFormat, strtotime($dateString));
- }
return CRM_Utils_Date::customFormat($dateString, $dateFormat);
}
diff --git a/civicrm/CRM/Core/xml/Menu/Admin.xml b/civicrm/CRM/Core/xml/Menu/Admin.xml
index 1e913a2af2..f6dcf0c614 100644
--- a/civicrm/CRM/Core/xml/Menu/Admin.xml
+++ b/civicrm/CRM/Core/xml/Menu/Admin.xml
@@ -454,12 +454,13 @@
</item>
<item>
<path>civicrm/admin/paymentProcessor</path>
- <title>Payment Processor</title>
+ <title>Settings - Payment Processor</title>
<desc>Payment Processor setup for CiviCRM transactions</desc>
<page_callback>CRM_Admin_Page_PaymentProcessor</page_callback>
<adminGroup>System Settings</adminGroup>
<icon>admin/small/online_contribution_pages.png</icon>
<weight>30</weight>
+ <access_arguments>administer payment processors</access_arguments>
</item>
<item>
<path>civicrm/admin/setting/mapping</path>
@@ -636,12 +637,6 @@
<page_callback>CRM_Admin_Page_AJAX::getNavigationMenu</page_callback>
<access_arguments>access CiviCRM</access_arguments>
</item>
- <item>
- <path>civicrm/ajax/menu</path>
- <page_callback>CRM_Admin_Page_AJAX::getNavigationList</page_callback>
- <access_arguments>access CiviCRM,administer CiviCRM</access_arguments>
- <page_type>3</page_type>
- </item>
<item>
<path>civicrm/ajax/menutree</path>
<page_callback>CRM_Admin_Page_AJAX::menuTree</page_callback>
diff --git a/civicrm/CRM/Core/xml/Menu/Contact.xml b/civicrm/CRM/Core/xml/Menu/Contact.xml
index 139466d246..092a67924b 100644
--- a/civicrm/CRM/Core/xml/Menu/Contact.xml
+++ b/civicrm/CRM/Core/xml/Menu/Contact.xml
@@ -121,6 +121,7 @@
<path>civicrm/contact/merge</path>
<title>Merge Contact</title>
<page_callback>CRM_Contact_Form_Merge</page_callback>
+ <access_arguments>merge duplicate contacts</access_arguments>
</item>
<item>
<path>civicrm/contact/email</path>
diff --git a/civicrm/CRM/Dedupe/Merger.php b/civicrm/CRM/Dedupe/Merger.php
index 1905a85fdc..4f88b36282 100644
--- a/civicrm/CRM/Dedupe/Merger.php
+++ b/civicrm/CRM/Dedupe/Merger.php
@@ -1058,8 +1058,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
$qfZeroBug = 'e8cddb72-a257-11dc-b9cc-0016d3330ee9';
$fields = self::getMergeFieldsMetadata();
- $main = self::getMergeContactDetails($mainId, 'main');
- $other = self::getMergeContactDetails($otherId, 'main');
+ $main = self::getMergeContactDetails($mainId);
+ $other = self::getMergeContactDetails($otherId);
$specialValues['main'] = self::getSpecialValues($main);
$specialValues['other'] = self::getSpecialValues($other);
@@ -1165,7 +1165,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
$values = civicrm_api3($blockName, 'get', $searchParams);
if ($values['count']) {
$cnt = 0;
- foreach ($values['values'] as $index => $value) {
+ foreach ($values['values'] as $value) {
$locations[$moniker][$blockName][$cnt] = $value;
// Fix address display
if ($blockName == 'address') {
@@ -1519,10 +1519,9 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
CRM_Core_DAO::$_nullObject, NULL, -1
);
}
- $cgTree = &$treeCache[$migrationInfo['main_details']['contact_type']];
$cFields = array();
- foreach ($cgTree as $key => $group) {
+ foreach ($treeCache[$migrationInfo['main_details']['contact_type']] as $key => $group) {
if (!isset($group['fields'])) {
continue;
}
@@ -1993,13 +1992,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
* Get the details of the contact to be merged.
*
* @param int $contact_id
- * @param string $moniker
*
* @return array
*
* @throws CRM_Core_Exception
*/
- public static function getMergeContactDetails($contact_id, $moniker) {
+ public static function getMergeContactDetails($contact_id) {
$params = array(
'contact_id' => $contact_id,
'version' => 3,
@@ -2009,9 +2007,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// CRM-18480: Cancel the process if the contact is already deleted
if (isset($result['values'][$contact_id]['contact_is_deleted']) && !empty($result['values'][$contact_id]['contact_is_deleted'])) {
- throw new CRM_Core_Exception(ts('Cannot merge because the \'%1\' contact (ID %2) has been deleted.', array(
- 1 => $moniker,
- 2 => $contact_id,
+ throw new CRM_Core_Exception(ts('Cannot merge because one contact (ID %1) has been deleted.', array(
+ 1 => $contact_id,
)));
}
diff --git a/civicrm/CRM/Event/BAO/Participant.php b/civicrm/CRM/Event/BAO/Participant.php
index 2b4dbc402a..54ca31c2f4 100644
--- a/civicrm/CRM/Event/BAO/Participant.php
+++ b/civicrm/CRM/Event/BAO/Participant.php
@@ -1906,7 +1906,12 @@ WHERE civicrm_participant.contact_id = {$contactID} AND
// if found in submitted items, do not use it for new item creations
if (in_array($previousLineItem['price_field_value_id'], $submittedFieldValueIds)) {
// if submitted line items are existing don't fire INSERT query
- unset($insertLines[$previousLineItem['price_field_value_id']]);
+ if ($previousLineItem['line_total'] != 0) {
+ unset($insertLines[$previousLineItem['price_field_value_id']]);
+ }
+ else {
+ $insertLines[$previousLineItem['price_field_value_id']]['skip'] = TRUE;
+ }
// for updating the line items i.e. use-case - once deselect-option selecting again
if (($previousLineItem['line_total'] != $submittedLineItems[$previousLineItem['price_field_value_id']]['line_total']) ||
($submittedLineItems[$previousLineItem['price_field_value_id']]['line_total'] == 0 && $submittedLineItems[$previousLineItem['price_field_value_id']]['qty'] == 1) ||
@@ -2026,10 +2031,12 @@ WHERE (li.entity_table = 'civicrm_participant' AND li.entity_id = {$participantI
// insert new line items
if (!empty($insertLines)) {
foreach ($insertLines as $valueId => $lineParams) {
- $lineParams['entity_table'] = 'civicrm_participant';
- $lineParams['entity_id'] = $participantId;
- $lineParams['contribution_id'] = $contributionId;
- $lineObj = CRM_Price_BAO_LineItem::create($lineParams);
+ if (!array_key_exists('skip', $lineParams)) {
+ $lineParams['entity_table'] = 'civicrm_participant';
+ $lineParams['entity_id'] = $participantId;
+ $lineParams['contribution_id'] = $contributionId;
+ $lineObj = CRM_Price_BAO_LineItem::create($lineParams);
+ }
}
}
diff --git a/civicrm/CRM/Event/Form/Task/Batch.php b/civicrm/CRM/Event/Form/Task/Batch.php
index bec74ceb2b..515ce6d04b 100644
--- a/civicrm/CRM/Event/Form/Task/Batch.php
+++ b/civicrm/CRM/Event/Form/Task/Batch.php
@@ -269,9 +269,6 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
/**
* Process the form after the input has been submitted and validated.
- *
- *
- * @return void
*/
public function postProcess() {
$params = $this->exportValues();
@@ -286,12 +283,8 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
);
$value['id'] = $key;
- if (!empty($value['participant_register_date'])) {
- $value['register_date'] = CRM_Utils_Date::processDate($value['participant_register_date'], $value['participant_register_date_time']);
- }
if (!empty($value['participant_role'])) {
- $participantRoles = CRM_Event_PseudoConstant::participantRole();
if (is_array($value['participant_role'])) {
$value['role_id'] = implode(CRM_Core_DAO::VALUE_SEPARATOR, array_keys($value['participant_role']));
}
@@ -318,14 +311,9 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
}
}
- if (!empty($value['participant_source'])) {
- $value['source'] = $value['participant_source'];
- }
- unset($value['participant_register_date']);
unset($value['participant_status']);
- unset($value['participant_source']);
- CRM_Event_BAO_Participant::create($value);
+ civicrm_api3('Participant', 'create', $value);
//need to trigger mails when we change status
if ($statusChange) {
diff --git a/civicrm/CRM/Event/Selector/Search.php b/civicrm/CRM/Event/Selector/Search.php
index 0ed98c3dc5..bdef479abb 100644
--- a/civicrm/CRM/Event/Selector/Search.php
+++ b/civicrm/CRM/Event/Selector/Search.php
@@ -370,6 +370,14 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co
'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=event',
'title' => ts('Record Payment'),
);
+ if (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
+ $links[CRM_Core_Action::BASIC] = array(
+ 'name' => ts('Submit Credit Card payment'),
+ 'url' => 'civicrm/payment/add',
+ 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=event&mode=live',
+ 'title' => ts('Submit Credit Card payment'),
+ );
+ }
}
if ($statusTypes[$row['participant_status_id']] == 'Pending refund') {
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessor.php b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
index 80125a8edc..48174616d4 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
@@ -79,6 +79,17 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
CRM_Financial_BAO_FinancialTypeAccount::add($values);
}
+ if (isset($params['id']) && isset($params['is_active']) && !isset($params['is_test'])) {
+ // check if is_active has changed & if so update test instance is_active too.
+ $test_id = self::getTestProcessorId($params['id']);
+ $testDAO = new CRM_Financial_DAO_PaymentProcessor();
+ $testDAO->id = $test_id;
+ if ($testDAO->find(TRUE)) {
+ $testDAO->is_active = $params['is_active'];
+ $testDAO->save();
+ }
+ }
+
Civi\Payment\System::singleton()->flushProcessors();
return $processor;
}
@@ -252,6 +263,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
return civicrm_api3('payment_processor', 'getvalue', array(
'return' => 'id',
'name' => $liveProcessorName,
+ 'is_test' => 1,
'domain_id' => CRM_Core_Config::domainID(),
));
}
@@ -402,6 +414,21 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
/**
* Is there a processor on this site with the specified capability.
+ *
+ * The capabilities are defined on CRM_Core_Payment and can be extended by
+ * processors.
+ *
+ * examples are
+ * - supportsBackOffice
+ * - supportsLiveMode
+ * - supportsFutureRecurDate
+ * - supportsCancelRecurring
+ * - supportsRecurContributionsForPledges
+ *
+ * They are passed as array('BackOffice');
+ *
+ * Details of specific functions are in the docblocks on the CRM_Core_Payment class.
+ *
* @param array $capabilities
*
* @return bool
diff --git a/civicrm/CRM/Financial/DAO/PaymentProcessor.php b/civicrm/CRM/Financial/DAO/PaymentProcessor.php
index 287d04d762..698fab0a6a 100644
--- a/civicrm/CRM/Financial/DAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/DAO/PaymentProcessor.php
@@ -30,7 +30,7 @@
*
* Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d5485d41addbdca4a391125775dea22c)
+ * (GenCodeChecksum:1a8c248f76428a0d765483634cf988f7)
*/
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Utils/Type.php';
@@ -238,6 +238,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'description' => array(
'name' => 'description',
@@ -300,6 +303,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'password' => array(
'name' => 'password',
@@ -310,14 +316,22 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'signature' => array(
'name' => 'signature',
'type' => CRM_Utils_Type::T_TEXT,
'title' => ts('Signature') ,
+ 'rows' => 4,
+ 'cols' => 40,
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'TextArea',
+ ) ,
) ,
'url_site' => array(
'name' => 'url_site',
@@ -328,6 +342,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'url_api' => array(
'name' => 'url_api',
@@ -338,6 +355,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'url_recur' => array(
'name' => 'url_recur',
@@ -348,6 +368,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'url_button' => array(
'name' => 'url_button',
@@ -358,6 +381,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'subject' => array(
'name' => 'subject',
@@ -368,6 +394,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
'table_name' => 'civicrm_payment_processor',
'entity' => 'PaymentProcessor',
'bao' => 'CRM_Financial_BAO_PaymentProcessor',
+ 'html' => array(
+ 'type' => 'Text',
+ ) ,
) ,
'class_name' => array(
'name' => 'class_name',
diff --git a/civicrm/CRM/Financial/Form/Payment.php b/civicrm/CRM/Financial/Form/Payment.php
index dbb50070eb..8d4969ee4f 100644
--- a/civicrm/CRM/Financial/Form/Payment.php
+++ b/civicrm/CRM/Financial/Form/Payment.php
@@ -104,10 +104,10 @@ class CRM_Financial_Form_Payment extends CRM_Core_Form {
$creditCards = CRM_Financial_BAO_PaymentProcessor::getCreditCards($paymentProcessorID);
$creditCardTypes = CRM_Core_Payment_Form::getCreditCardCSSNames($creditCards);
CRM_Core_Resources::singleton()
- ->addScriptFile('civicrm', 'templates/CRM/Core/BillingBlock.js', 10)
+ ->addScriptFile('civicrm', 'templates/CRM/Core/BillingBlock.js', 10, 'html-header', FALSE)
// workaround for CRM-13634
// ->addSetting(array('config' => array('creditCardTypes' => $creditCardTypes)));
- ->addScript('CRM.config.creditCardTypes = ' . json_encode($creditCardTypes) . ';');
+ ->addScript('CRM.config.creditCardTypes = ' . json_encode($creditCardTypes) . ';', '-9999', 'html-header');
}
}
diff --git a/civicrm/CRM/Financial/Page/AJAX.php b/civicrm/CRM/Financial/Page/AJAX.php
index 6d7ec441e2..2715e99b9e 100644
--- a/civicrm/CRM/Financial/Page/AJAX.php
+++ b/civicrm/CRM/Financial/Page/AJAX.php
@@ -296,8 +296,8 @@ class CRM_Financial_Page_AJAX {
'contact_a.contact_type',
'contact_a.contact_sub_type',
'civicrm_financial_trxn.trxn_date as transaction_date',
- 'name',
- 'civicrm_contribution.currency as currency',
+ 'civicrm_financial_type.name',
+ 'civicrm_financial_trxn.currency as currency',
'civicrm_financial_trxn.status_id as status',
'civicrm_financial_trxn.check_number as check_number',
);
diff --git a/civicrm/CRM/Group/Page/Group.php b/civicrm/CRM/Group/Page/Group.php
index d78bec5cfc..c371fe56bc 100644
--- a/civicrm/CRM/Group/Page/Group.php
+++ b/civicrm/CRM/Group/Page/Group.php
@@ -128,7 +128,7 @@ class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
if (!empty($_GET['update_smart_groups'])) {
CRM_Contact_BAO_GroupContactCache::loadAll();
}
- elseif (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_group_contact_cache LIMIT 1")) {
+ elseif (!CRM_Core_DAO::singleValueQuery("SELECT contact_id FROM civicrm_group_contact_cache LIMIT 1")) {
CRM_Core_Session::setStatus(ts('Count data for smart groups is not currently calculated. You may click Update Smart Groups to generate it. Be aware this can cause significant server load'));
}
diff --git a/civicrm/CRM/Mailing/BAO/Mailing.php b/civicrm/CRM/Mailing/BAO/Mailing.php
index d746b5abc8..ba934f368f 100644
--- a/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -1452,6 +1452,7 @@ ORDER BY civicrm_email.is_bulkmail DESC
*
* @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
@@ -1469,7 +1470,7 @@ ORDER BY civicrm_email.is_bulkmail DESC
if ($type == 'embedded_url') {
$embed_data = array();
foreach ($token as $t) {
- $embed_data[] = $this->getTokenData($t, $html = FALSE, $contact, $verp, $urls, $event_queue_id);
+ $embed_data[] = $this->getTokenData($t, $html, $contact, $verp, $urls, $event_queue_id);
}
$numSlices = count($embed_data);
$url = '';
@@ -1488,6 +1489,10 @@ ORDER BY civicrm_email.is_bulkmail DESC
$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) {
diff --git a/civicrm/CRM/Member/BAO/Membership.php b/civicrm/CRM/Member/BAO/Membership.php
index 4831547ca3..527ba64358 100644
--- a/civicrm/CRM/Member/BAO/Membership.php
+++ b/civicrm/CRM/Member/BAO/Membership.php
@@ -1942,7 +1942,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND
// Insert renewed dates for CURRENT membership
$memParams = array();
$memParams['join_date'] = CRM_Utils_Date::isoToMysql($membership->join_date);
- $memParams['start_date'] = CRM_Utils_Date::isoToMysql($membership->start_date);
+ $memParams['start_date'] = CRM_Utils_Array::value('start_date', $formDates, CRM_Utils_Date::isoToMysql($membership->start_date));
$memParams['end_date'] = CRM_Utils_Array::value('end_date', $formDates);
if (empty($memParams['end_date'])) {
$memParams['end_date'] = CRM_Utils_Array::value('end_date', $dates);
diff --git a/civicrm/CRM/Member/Form/Task/Batch.php b/civicrm/CRM/Member/Form/Task/Batch.php
index 389f1343a9..32e513a47d 100644
--- a/civicrm/CRM/Member/Form/Task/Batch.php
+++ b/civicrm/CRM/Member/Form/Task/Batch.php
@@ -133,7 +133,6 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task {
$this->assign('profileTitle', $this->_title);
$this->assign('componentIds', $this->_memberIds);
- $fileFieldExists = FALSE;
//load all campaigns.
if (array_key_exists('member_campaign_id', $this->_fields)) {
@@ -151,6 +150,7 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task {
foreach ($this->_fields as $name => $field) {
if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($name)) {
$customValue = CRM_Utils_Array::value($customFieldID, $customFields);
+ $entityColumnValue = array();
if (!empty($customValue['extends_entity_column_value'])) {
$entityColumnValue = explode(CRM_Core_DAO::VALUE_SEPARATOR,
$customValue['extends_entity_column_value']
@@ -194,7 +194,6 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task {
$defaults = array();
foreach ($this->_memberIds as $memberId) {
- $details[$memberId] = array();
CRM_Core_BAO_UFGroup::setProfileDefaults(NULL, $this->_fields, $defaults, FALSE, $memberId, 'Membership');
}
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index 6f3284c63b..969402bd73 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -89,6 +89,9 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
return $priceField;
}
+ if (!empty($params['id']) && empty($priceField->html_type)) {
+ $priceField->html_type = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $params['id'], 'html_type');
+ }
$optionsIds = array();
$maxIndex = CRM_Price_Form_Field::NUM_OPTION;
@@ -101,6 +104,12 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
// update previous field values( if any )
if ($fieldValue->find(TRUE)) {
$optionsIds['id'] = $fieldValue->id;
+
+ //Update price_field_value label when edited inline.
+ if (!empty($params['id']) && $priceField->label != $fieldValue->label) {
+ $fieldValue->label = $priceField->label;
+ $fieldValue->save();
+ }
}
}
$defaultArray = array();
diff --git a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 3e29e7f7d8..49d3a214bf 100644
--- a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -234,7 +234,7 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic {
CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $param, $returnValues, $returnProperities);
if ($returnValues['data_type'] == 'Date') {
$dateFields[$fieldIDs[$key]] = 1;
- $actualPHPFormats = CRM_Core_SelectValues::datePluginToPHPFormats();
+ $actualPHPFormats = CRM_Utils_Date::datePluginToPHPFormats();
$dateFormat = (array) CRM_Utils_Array::value($returnValues['date_format'], $actualPHPFormats);
$timeFormat = CRM_Utils_Array::value('time_format', $returnValues);
}
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index 5e1812e5f9..62000041db 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -329,7 +329,7 @@ class CRM_Report_Form extends CRM_Core_Form {
*
* @var array
*/
- protected $_selectedTables;
+ protected $_selectedTables = array();
/**
* Array of DAO tables having columns included in WHERE or HAVING clause
@@ -2290,6 +2290,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
if (array_key_exists('fields', $table)) {
foreach ($table['fields'] as $fieldName => $field) {
if ($tableName == 'civicrm_address') {
+ // deprecated, use $this->isTableSelected.
$this->_addressField = TRUE;
}
if ($tableName == 'civicrm_email') {
@@ -2315,50 +2316,10 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
// include statistics columns only if set
if (!empty($field['statistics'])) {
- foreach ($field['statistics'] as $stat => $label) {
- $alias = "{$tableName}_{$fieldName}_{$stat}";
- switch (strtolower($stat)) {
- case 'max':
- case 'sum':
- $select[] = "$stat({$field['dbAlias']}) as $alias";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
- $this->_statFields[$label] = $alias;
- $this->_selectAliases[] = $alias;
- break;
-
- case 'count':
- $select[] = "COUNT({$field['dbAlias']}) as $alias";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = CRM_Utils_Type::T_INT;
- $this->_statFields[$label] = $alias;
- $this->_selectAliases[] = $alias;
- break;
-
- case 'count_distinct':
- $select[] = "COUNT(DISTINCT {$field['dbAlias']}) as $alias";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = CRM_Utils_Type::T_INT;
- $this->_statFields[$label] = $alias;
- $this->_selectAliases[] = $alias;
- break;
-
- case 'avg':
- $select[] = "ROUND(AVG({$field['dbAlias']}),2) as $alias";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
- $this->_statFields[$label] = $alias;
- $this->_selectAliases[] = $alias;
- break;
- }
- }
+ $select = $this->addStatisticsToSelect($field, $tableName, $fieldName, $select);
}
else {
- $alias = "{$tableName}_{$fieldName}";
- $select[] = "{$field['dbAlias']} as $alias";
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
- $this->_selectAliases[] = $alias;
+ $select = $this->addBasicFieldToSelect($tableName, $fieldName, $field, $select);
}
}
}
@@ -2658,6 +2619,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->select();
$this->from();
$this->customDataFrom();
+ $this->buildPermissionClause();
$this->where();
if (array_key_exists('civicrm_contribution', $this->getVar('_columns'))) {
$this->getPermissionedFTQuery($this);
@@ -3607,7 +3569,8 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
}
/**
- * Build acl clauses.
+ * Buld contact acl clause
+ * @deprecated in favor of buildPermissionClause
*
* @param string $tableAlias
*/
@@ -3615,6 +3578,29 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
list($this->_aclFrom, $this->_aclWhere) = CRM_Contact_BAO_Contact_Permission::cacheClause($tableAlias);
}
+ /**
+ * Build the permision clause for all entities in this report
+ */
+ public function buildPermissionClause() {
+ $ret = array();
+ foreach ($this->selectedTables() as $tableName) {
+ $baoName = str_replace('_DAO_', '_BAO_', CRM_Core_DAO_AllCoreTables::getClassForTable($tableName));
+ if ($baoName && class_exists($baoName) && !empty($this->_columns[$tableName]['alias'])) {
+ $tableAlias = $this->_columns[$tableName]['alias'];
+ $clauses = array_filter($baoName::getSelectWhereClause($tableAlias));
+ foreach ($clauses as $field => $clause) {
+ // Skip contact_id field if redundant
+ if ($field != 'contact_id' || !in_array('civicrm_contact', $this->selectedTables())) {
+ $ret["$tableName.$field"] = $clause;
+ }
+ }
+ }
+ }
+ // Override output from buildACLClause
+ $this->_aclFrom = NULL;
+ $this->_aclWhere = implode(' AND ', $ret);
+ }
+
/**
* Add custom data to the columns.
*
@@ -4282,7 +4268,7 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
$rowLabels = array();
foreach ($rowValues as $rowValue) {
if ($rowValue) {
- $rowLabels[] = CRM_Core_Pseudoconstant::getLabel('CRM_Contact_BAO_Contact', $fieldName, $rowValue);
+ $rowLabels[] = CRM_Core_PseudoConstant::getLabel('CRM_Contact_BAO_Contact', $fieldName, $rowValue);
}
}
$rows[$rowNum]['civicrm_contact_' . $fieldName] = implode(', ', $rowLabels);
@@ -4681,7 +4667,7 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes);
if (empty($financialTypes)) {
$contFTs = "0";
- $liFTs = implode(',', array_keys(CRM_Contribute_Pseudoconstant::financialType()));
+ $liFTs = implode(',', array_keys(CRM_Contribute_PseudoConstant::financialType()));
}
else {
$contFTs = $liFTs = implode(',', array_keys($financialTypes));
@@ -4867,4 +4853,99 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
}
}
+ /**
+ * Get all labels for fields that are used in a group concat.
+ *
+ * @param string $options
+ * comma separated option values.
+ * @param string $baoName
+ * The BAO name for the field.
+ * @param string $fieldName
+ * The name of the field for which labels should be retrieved.
+ *
+ * return string
+ */
+ public function getLabels($options, $baoName, $fieldName) {
+ $types = explode(',', $options);
+ $labels = array();
+ foreach ($types as $value) {
+ $labels[$value] = CRM_Core_PseudoConstant::getLabel($baoName, $fieldName, $value);
+ }
+ return implode(', ', array_filter($labels));
+ }
+
+ /**
+ * Add statistics columns.
+ *
+ * If a group by is in play then add columns for the statistics fields.
+ *
+ * This would lead to a new field in the $row such as $fieldName_sum and a new, matching
+ * column header field.
+ *
+ * @param array $field
+ * @param string $tableName
+ * @param string $fieldName
+ * @param array $select
+ *
+ * @return array
+ */
+ protected function addStatisticsToSelect($field, $tableName, $fieldName, $select) {
+ foreach ($field['statistics'] as $stat => $label) {
+ $alias = "{$tableName}_{$fieldName}_{$stat}";
+ switch (strtolower($stat)) {
+ case 'max':
+ case 'sum':
+ $select[] = "$stat({$field['dbAlias']}) as $alias";
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
+ $this->_statFields[$label] = $alias;
+ $this->_selectAliases[] = $alias;
+ break;
+
+ case 'count':
+ $select[] = "COUNT({$field['dbAlias']}) as $alias";
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = CRM_Utils_Type::T_INT;
+ $this->_statFields[$label] = $alias;
+ $this->_selectAliases[] = $alias;
+ break;
+
+ case 'count_distinct':
+ $select[] = "COUNT(DISTINCT {$field['dbAlias']}) as $alias";
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = CRM_Utils_Type::T_INT;
+ $this->_statFields[$label] = $alias;
+ $this->_selectAliases[] = $alias;
+ break;
+
+ case 'avg':
+ $select[] = "ROUND(AVG({$field['dbAlias']}),2) as $alias";
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
+ $this->_statFields[$label] = $alias;
+ $this->_selectAliases[] = $alias;
+ break;
+ }
+ }
+ return $select;
+ }
+
+ /**
+ * Add a basic field to the select clause.
+ *
+ * @param string $tableName
+ * @param string $fieldName
+ * @param array $field
+ * @param string $select
+ * @return array
+ */
+ protected function addBasicFieldToSelect($tableName, $fieldName, $field, $select) {
+ $alias = "{$tableName}_{$fieldName}";
+ $select[] = "{$field['dbAlias']} as $alias";
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
+ $this->_selectAliases[] = $alias;
+ return $select;
+ }
+
}
diff --git a/civicrm/CRM/Report/Form/Activity.php b/civicrm/CRM/Report/Form/Activity.php
index 820b6f6d1e..d294920864 100644
--- a/civicrm/CRM/Report/Form/Activity.php
+++ b/civicrm/CRM/Report/Form/Activity.php
@@ -727,7 +727,7 @@ FROM civireport_activity_temp_target tar
GROUP BY civicrm_activity_id $having {$this->_orderBy}";
$select = 'AS addtogroup_contact_id';
$query = str_ireplace('AS civicrm_contact_contact_target_id', $select, $query);
- $dao = CRM_Core_DAO::executeQuery($query);
+ $dao = $this->executeReportQuery($query);
$contactIDs = array();
// Add resulting contacts to group
@@ -804,7 +804,7 @@ GROUP BY civicrm_activity_id $having {$this->_orderBy}";
$insertCols = implode(',', $this->_selectAliases);
$tempQuery = "CREATE TEMPORARY TABLE civireport_activity_temp_target {$this->_databaseAttributes} AS
{$this->_select} {$this->_from} {$this->_where} ";
- CRM_Core_DAO::executeQuery($tempQuery);
+ $this->executeReportQuery($tempQuery);
// 2. add new columns to hold assignee and source results
// fixme: add when required
@@ -819,7 +819,7 @@ GROUP BY civicrm_activity_id $having {$this->_orderBy}";
ADD COLUMN civicrm_phone_contact_source_phone VARCHAR(128),
ADD COLUMN civicrm_email_contact_assignee_email VARCHAR(128),
ADD COLUMN civicrm_email_contact_source_email VARCHAR(128)";
- CRM_Core_DAO::executeQuery($tempQuery);
+ $this->executeReportQuery($tempQuery);
// 3. fill temp table with assignee results
$this->buildACLClause(array('civicrm_contact_assignee'));
@@ -831,7 +831,7 @@ GROUP BY civicrm_activity_id $having {$this->_orderBy}";
$tempQuery = "INSERT INTO civireport_activity_temp_target ({$insertCols})
{$this->_select}
{$this->_from} {$this->_where}";
- CRM_Core_DAO::executeQuery($tempQuery);
+ $this->executeReportQuery($tempQuery);
// 4. fill temp table with source results
$this->buildACLClause(array('civicrm_contact_source'));
@@ -843,7 +843,7 @@ GROUP BY civicrm_activity_id $having {$this->_orderBy}";
$tempQuery = "INSERT INTO civireport_activity_temp_target ({$insertCols})
{$this->_select}
{$this->_from} {$this->_where}";
- CRM_Core_DAO::executeQuery($tempQuery);
+ $this->executeReportQuery($tempQuery);
// 5. show final result set from temp table
$rows = array();
@@ -1079,7 +1079,7 @@ FROM civireport_activity_temp_target tar
// initialize array of total counts
$totals = array();
- $dao = CRM_Core_DAO::executeQuery($query);
+ $dao = $this->executeReportQuery($query);
while ($dao->fetch()) {
// let $this->_alterDisplay translate any integer ids to human-readable values.
$rows[0] = $dao->toArray();
diff --git a/civicrm/CRM/Report/Form/Contact/Relationship.php b/civicrm/CRM/Report/Form/Contact/Relationship.php
index 88cd1f4538..431b2b8fb1 100644
--- a/civicrm/CRM/Report/Form/Contact/Relationship.php
+++ b/civicrm/CRM/Report/Form/Contact/Relationship.php
@@ -263,7 +263,7 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
'relationship_type_id' => array(
'title' => ts('Relationship'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
- 'options' => CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, NULL, TRUE),
+ 'options' => CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, NULL, NULL, NULL, TRUE),
'type' => CRM_Utils_Type::T_INT,
),
'start_date' => array(
diff --git a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
index 3cbe603608..51ad22ca79 100644
--- a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -315,6 +315,9 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'title' => ts('Trans #'),
'default' => TRUE,
),
+ 'card_type' => array(
+ 'title' => ts('Credit Card Type'),
+ ),
),
'filters' => array(
'payment_instrument_id' => array(
@@ -341,6 +344,13 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
'default' => array(1),
),
+ 'card_type' => array(
+ 'title' => ts('Credit Card Type'),
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialTrxn', 'card_type'),
+ 'default' => NULL,
+ 'type' => CRM_Utils_Type::T_STRING,
+ ),
),
'order_bys' => array(
'payment_instrument_id' => array('title' => ts('Payment Method')),
@@ -602,6 +612,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
$contributionTypes = CRM_Contribute_PseudoConstant::financialType();
$paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument();
$contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus();
+ $creditCardTypes = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialTrxn', 'card_type');
foreach ($rows as $rowNum => $row) {
// convert display name to links
if (array_key_exists('civicrm_contact_sort_name', $row) &&
@@ -643,6 +654,11 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
$entryFound = TRUE;
}
+ if (!empty($row['civicrm_financial_trxn_card_type'])) {
+ $rows[$rowNum]['civicrm_financial_trxn_card_type'] = CRM_Utils_Array::value($row['civicrm_financial_trxn_card_type'], $creditCardTypes);
+ $entryFound = TRUE;
+ }
+
// display birthday in the configured custom format
if (array_key_exists('civicrm_contact_birth_date', $row)) {
$birthDate = $row['civicrm_contact_birth_date'];
diff --git a/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php b/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
index e80e02a3eb..8b34e55c9b 100644
--- a/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
+++ b/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
@@ -42,12 +42,28 @@ class CRM_Report_Form_Contribute_DeferredRevenue extends CRM_Report_Form {
/**
*/
public function __construct() {
- $this->_autoIncludeIndexedFieldsAsOrderBys = 1;
+ $this->_exposeContactID = FALSE;
$this->_deferredFinancialAccount = CRM_Financial_BAO_FinancialAccount::getAllDeferredFinancialAccount();
$this->_columns = array(
'civicrm_financial_account' => array(
'dao' => 'CRM_Financial_DAO_FinancialAccount',
- 'alias' => 'financial_account_deferred',
+ 'fields' => array(
+ 'name' => array(
+ 'title' => ts('Deferred Account'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'id' => array(
+ 'title' => ts('Deferred Account ID'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'accounting_code' => array(
+ 'title' => ts('Deferred Accounting Code'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ ),
'filters' => array(
'id' => array(
'title' => ts('Deferred Financial Account'),
@@ -57,131 +73,272 @@ class CRM_Report_Form_Contribute_DeferredRevenue extends CRM_Report_Form {
),
),
),
+ 'civicrm_financial_account_1' => array(
+ 'dao' => 'CRM_Financial_DAO_FinancialAccount',
+ 'fields' => array(
+ 'name' => array(
+ 'title' => ts('Revenue Account'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'id' => array(
+ 'title' => ts('Revenue Account ID'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'accounting_code' => array(
+ 'title' => ts('Revenue Accounting code'),
+ 'no_display' => TRUE,
+ 'required' => TRUE,
+ ),
+ ),
+ ),
+ 'civicrm_financial_item' => array(
+ 'dao' => 'CRM_Financial_DAO_FinancialItem',
+ 'fields' => array(
+ 'status_id' => array(
+ 'title' => ts('Status'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'id' => array(
+ 'title' => ts('Financial Item ID'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'description' => array(
+ 'title' => ts('Description'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ ),
+ ),
+ 'civicrm_financial_trxn_1' => array(
+ 'dao' => 'CRM_Financial_DAO_FinancialTrxn',
+ 'fields' => array(
+ 'total_amount' => array(
+ 'title' => ts('Deferred Transaction Amount'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ 'dbAlias' => 'GROUP_CONCAT(financial_trxn_1_civireport.total_amount)',
+ ),
+ 'trxn_date' => array(
+ 'title' => ts('Deferred Transaction Date'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ 'dbAlias' => 'GROUP_CONCAT(financial_trxn_1_civireport.trxn_date)',
+ ),
+ ),
+ ),
+ 'civicrm_contact' => array(
+ 'dao' => 'CRM_Contact_DAO_Contact',
+ 'fields' => array(
+ 'display_name' => array(
+ 'title' => ts('Display_name'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ ),
+ ),
+ 'civicrm_membership' => array(
+ 'dao' => 'CRM_Member_DAO_Membership',
+ 'fields' => array(
+ 'start_date' => array(
+ 'title' => ts('Start Date'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ 'dbAlias' => 'IFNULL(membership_civireport.start_date, event_civireport.start_date)',
+ ),
+ 'end_date' => array(
+ 'title' => ts('End Date'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ 'dbdbAlias' => 'IFNULL(membership_civireport.end_date, event_civireport.end_date)',
+ ),
+ ),
+ ),
+ 'civicrm_event' => array(
+ 'dao' => 'CRM_Event_DAO_Event',
+ ),
+ 'civicrm_participant' => array(
+ 'dao' => 'CRM_Event_DAO_Participant',
+ ),
+ 'civicrm_batch' => array(
+ 'dao' => 'CRM_Batch_DAO_EntityBatch',
+ 'grouping' => 'contri-fields',
+ 'filters' => array(
+ 'batch_id' => array(
+ 'title' => ts('Batch Title'),
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Batch_BAO_Batch::getBatches(),
+ 'type' => CRM_Utils_Type::T_INT,
+ ),
+ ),
+ ),
+ 'civicrm_contribution' => array(
+ 'dao' => 'CRM_Contribute_DAO_Contribution',
+ 'fields' => array(
+ 'id' => array(
+ 'title' => ts('Contribution ID'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'contact_id' => array(
+ 'title' => ts('Contact ID'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'source' => array(
+ 'title' => ts('Source'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ ),
+ 'filters' => array(
+ 'receive_date' => array(
+ 'title' => ts('Receive Date'),
+ 'operatorType' => CRM_Report_Form::OP_DATE,
+ 'type' => CRM_Utils_Type::T_DATE,
+ ),
+ 'cancel_date' => array(
+ 'title' => ts('Cancel Date'),
+ 'operatorType' => CRM_Report_Form::OP_DATE,
+ 'type' => CRM_Utils_Type::T_DATE,
+ ),
+ 'revenue_recognition_date' => array(
+ 'title' => ts('Revenue Recognition Date'),
+ 'operatorType' => CRM_Report_Form::OP_DATE,
+ 'type' => CRM_Utils_Type::T_DATE,
+ ),
+ ),
+ ),
+ 'civicrm_financial_trxn' => array(
+ 'dao' => 'CRM_Financial_DAO_FinancialTrxn',
+ 'fields' => array(
+ 'status_id' => array(
+ 'title' => ts('Transaction Status'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'trxn_date' => array(
+ 'title' => ts('Transaction Date'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ 'total_amount' => array(
+ 'title' => ts('Transaction Amount'),
+ 'required' => TRUE,
+ 'no_display' => TRUE,
+ ),
+ ),
+ 'filters' => array(
+ 'trxn_date' => array(
+ 'title' => ts('Transaction Date'),
+ 'operatorType' => CRM_Report_Form::OP_DATE,
+ 'type' => CRM_Utils_Type::T_DATE,
+ ),
+ ),
+ ),
);
parent::__construct();
}
+ /**
+ * Pre process function.
+ *
+ * Called prior to build form.
+ */
public function preProcess() {
parent::preProcess();
}
- public function select() {
- // TODO: add column
- $this->_select = ' SELECT
-financial_account_deferred_civireport.name deferred_account,
-financial_account_deferred_civireport.id deferred_account_id,
-financial_account_deferred_civireport.accounting_code deferred_account_code,
-financial_account_revenue.name revenue_account,
-financial_account_revenue.id revenue_account_id,
-financial_account_revenue.accounting_code revenue_account_code,
-financial_item.status_id,
-financial_item.id item_id,
-financial_trxn_contribution_1.status_id,
-financial_trxn_contribution_1.trxn_date transaction_date,
-financial_trxn_contribution_1.total_amount,
-contribution.id contribution_id,
-contribution.contact_id,
-contact.display_name,
-contribution.source,
-GROUP_CONCAT(financial_trxn.total_amount) trxn_amount,
-GROUP_CONCAT(financial_trxn.trxn_date) trxn_date,
-financial_item.description,
-IFNULL(membership.start_date, event.start_date) start_date,
-IFNULL(membership.end_date, event.end_date) end_date
-';
- }
-
+ /**
+ * Build from clause.
+ */
public function from() {
$deferredRelationship = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Deferred Revenue Account is' "));
$revenueRelationship = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' "));
- $this->_from = " FROM civicrm_financial_item financial_item
+ $this->_from = " FROM civicrm_financial_item {$this->_aliases['civicrm_financial_item']}
INNER JOIN civicrm_entity_financial_account entity_financial_account_deferred
- ON financial_item.financial_account_id = entity_financial_account_deferred.financial_account_id AND entity_financial_account_deferred.entity_table = 'civicrm_financial_type'
+ ON {$this->_aliases['civicrm_financial_item']}.financial_account_id = entity_financial_account_deferred.financial_account_id AND entity_financial_account_deferred.entity_table = 'civicrm_financial_type'
AND entity_financial_account_deferred.account_relationship = {$deferredRelationship}
-INNER JOIN civicrm_financial_account financial_account_deferred_civireport
- ON entity_financial_account_deferred.financial_account_id = financial_account_deferred_civireport.id
+INNER JOIN civicrm_financial_account {$this->_aliases['civicrm_financial_account']}
+ ON entity_financial_account_deferred.financial_account_id = {$this->_aliases['civicrm_financial_account']}.id
INNER JOIN civicrm_entity_financial_account entity_financial_account_revenue
ON entity_financial_account_deferred.entity_id = entity_financial_account_revenue.entity_id
AND entity_financial_account_deferred.entity_table= entity_financial_account_revenue.entity_table
-INNER JOIN civicrm_financial_account financial_account_revenue
- ON entity_financial_account_revenue.financial_account_id = financial_account_revenue.id
+INNER JOIN civicrm_financial_account {$this->_aliases['civicrm_financial_account_1']}
+ ON entity_financial_account_revenue.financial_account_id = {$this->_aliases['civicrm_financial_account_1']}.id
AND {$revenueRelationship} = entity_financial_account_revenue.account_relationship
INNER JOIN civicrm_entity_financial_trxn entity_financial_trxn_item
- ON entity_financial_trxn_item.entity_id = financial_item.id AND entity_financial_trxn_item.entity_table = 'civicrm_financial_item'
-INNER JOIN civicrm_financial_trxn financial_trxn
- ON financial_trxn.from_financial_account_id = financial_account_deferred_civireport.id AND financial_trxn.id = entity_financial_trxn_item.financial_trxn_id
+ ON entity_financial_trxn_item.entity_id = {$this->_aliases['civicrm_financial_item']}.id AND entity_financial_trxn_item.entity_table = 'civicrm_financial_item'
+INNER JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn_1']}
+ ON {$this->_aliases['civicrm_financial_trxn_1']}.from_financial_account_id = {$this->_aliases['civicrm_financial_account']}.id AND {$this->_aliases['civicrm_financial_trxn_1']}.id = entity_financial_trxn_item.financial_trxn_id
INNER JOIN civicrm_entity_financial_trxn financial_trxn_contribution
- ON financial_trxn_contribution.financial_trxn_id = financial_trxn.id AND financial_trxn_contribution.entity_table = 'civicrm_contribution'
-INNER JOIN civicrm_entity_financial_trxn entity_financial_trxn_contribution ON entity_financial_trxn_contribution.entity_id = financial_item.id and entity_financial_trxn_contribution.entity_table = 'civicrm_financial_item'
-INNER JOIN civicrm_financial_trxn financial_trxn_contribution_1 ON financial_trxn_contribution_1.id = entity_financial_trxn_contribution.financial_trxn_id AND (financial_trxn_contribution_1.from_financial_account_id NOT IN (" . implode(',', array_keys($this->_deferredFinancialAccount)) . ") OR financial_trxn_contribution_1.from_financial_account_id IS NULL)
-INNER JOIN civicrm_contribution contribution
- ON contribution.id = financial_trxn_contribution.entity_id
-INNER JOIN civicrm_contact contact
- ON contact.id = contribution.contact_id
+ ON financial_trxn_contribution.financial_trxn_id = {$this->_aliases['civicrm_financial_trxn_1']}.id AND financial_trxn_contribution.entity_table = 'civicrm_contribution'
+INNER JOIN civicrm_entity_financial_trxn entity_financial_trxn_contribution ON entity_financial_trxn_contribution.entity_id = {$this->_aliases['civicrm_financial_item']}.id and entity_financial_trxn_contribution.entity_table = 'civicrm_financial_item'
+INNER JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']} ON {$this->_aliases['civicrm_financial_trxn']}.id = entity_financial_trxn_contribution.financial_trxn_id AND ({$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id NOT IN (" . implode(',', array_keys($this->_deferredFinancialAccount)) . ") OR {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NULL)
+INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+ ON {$this->_aliases['civicrm_contribution']}.id = financial_trxn_contribution.entity_id
+INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id
INNER JOIN civicrm_line_item line_item
- ON line_item.contribution_id = contribution.id
-LEFT JOIN civicrm_membership membership
+ ON line_item.contribution_id = {$this->_aliases['civicrm_contribution']}.id
+LEFT JOIN civicrm_membership {$this->_aliases['civicrm_membership']}
ON CASE
WHEN line_item.entity_table = 'civicrm_membership'
- THEN line_item.entity_id = membership.id
- ELSE membership.id = 0
+ THEN line_item.entity_id = {$this->_aliases['civicrm_membership']}.id
+ ELSE {$this->_aliases['civicrm_membership']}.id = 0
END
-LEFT JOIN civicrm_participant participant
+LEFT JOIN civicrm_participant {$this->_aliases['civicrm_participant']}
ON CASE
WHEN line_item.entity_table = 'civicrm_participant'
- THEN line_item.entity_id = participant.id
- ELSE participant.id = 0
+ THEN line_item.entity_id = {$this->_aliases['civicrm_participant']}.id
+ ELSE {$this->_aliases['civicrm_participant']}.id = 0
END
-LEFT JOIN civicrm_event event ON participant.event_id = event.id
+LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']} ON {$this->_aliases['civicrm_participant']}.event_id = {$this->_aliases['civicrm_event']}.id
";
- }
-
- public function orderBy() {
- parent::orderBy();
- }
-
- public function where() {
- $clauses = array();
- foreach ($this->_columns as $tableName => $table) {
- if (array_key_exists('filters', $table)) {
- foreach ($table['filters'] as $fieldName => $field) {
- $clause = NULL;
- if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) {
- $relative = CRM_Utils_Array::value("{$fieldName}_relative", $this->_params);
- $from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
- $to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);
- $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
- }
- else {
- $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
- if ($op) {
- $clause = $this->whereClause($field,
- $op,
- CRM_Utils_Array::value("{$fieldName}_value", $this->_params),
- CRM_Utils_Array::value("{$fieldName}_min", $this->_params),
- CRM_Utils_Array::value("{$fieldName}_max", $this->_params)
- );
- }
- }
- if (!empty($clause)) {
- $clauses[] = $clause;
- }
- }
- }
- }
- if (!empty($clauses)) {
- $this->_where = 'WHERE ' . implode(' AND ', $clauses);
+ if (!empty($this->_params['batch_id_value'])) {
+ $this->_from .= "
+ LEFT JOIN civicrm_entity_batch {$this->_aliases['civicrm_batch']}
+ ON {$this->_aliases['civicrm_batch']}.entity_id = {$this->_aliases['civicrm_financial_trxn_1']}.id AND
+ {$this->_aliases['civicrm_batch']}.entity_table = 'civicrm_financial_trxn'\n";
}
}
+ /**
+ * Post process function.
+ */
public function postProcess() {
$this->_noFields = TRUE;
parent::postProcess();
}
+ /**
+ * Set limit.
+ *
+ * @param int $rowCount
+ */
+ public function limit($rowCount = self::ROW_COUNT_LIMIT) {
+ $this->_limit = NULL;
+ }
+
+ /**
+ * Build where clause.
+ */
+ public function where() {
+ parent::where();
+ $startDate = date('Y-m-01');
+ $endDate = date('Y-m-t', strtotime(date('ymd') . '+11 month'));
+ $this->_where .= " AND {$this->_aliases['civicrm_financial_trxn_1']}.trxn_date BETWEEN '{$startDate}' AND '{$endDate}'";
+ }
+
+ /**
+ * Build group by clause.
+ */
public function groupBy() {
- $this->_groupBy = "GROUP BY financial_account_deferred_civireport.id, financial_account_revenue.id, financial_item.id";
+ $this->_groupBy = "GROUP BY {$this->_aliases['civicrm_financial_account']}.id, {$this->_aliases['civicrm_financial_account_1']}.id, {$this->_aliases['civicrm_financial_item']}.id";
}
/**
@@ -210,52 +367,38 @@ LEFT JOIN civicrm_event event ON participant.event_id = event.id
'End Date' => 1,
);
$dateFormat = Civi::settings()->get('dateformatFinancialBatch');
+ for ($i = 0; $i < 12; $i++) {
+ //$columns[date('M, Y', strtotime("+1 month", date('Y-m-d')))] = 1;
+ $columns[date('M, Y', strtotime(date('Y-m-d') . "+{$i} month"))] = 1;
+ }
while ($dao->fetch()) {
- $arraykey = $dao->deferred_account_id . '_' . $dao->revenue_account_id;
+ $arraykey = $dao->civicrm_financial_account_id . '_' . $dao->civicrm_financial_account_1_id;
if (empty($rows[$arraykey])) {
- $rows[$arraykey]['label'] = "Deferred Revenue Account: {$dao->deferred_account} ({$dao->deferred_account_code}), Revenue Account: {$dao->revenue_account} {$dao->revenue_account_code}";
+ $rows[$arraykey]['label'] = "Deferred Revenue Account: {$dao->civicrm_financial_account_name} ({$dao->civicrm_financial_account_accounting_code}), Revenue Account: {$dao->civicrm_financial_account_1_name} {$dao->civicrm_financial_account_1_accounting_code}";
}
- $rows[$arraykey]['rows'][$dao->item_id] = array(
- 'Transaction' => $statuses[$dao->status_id],
- 'Date of Transaction' => CRM_Utils_Date::customFormat($dao->transaction_date, $dateFormat),
- 'Amount' => CRM_Utils_Money::format($dao->total_amount),
- 'Contribution ID' => $dao->contribution_id,
- 'Item' => $dao->description,
- 'Contact ID' => $dao->contact_id,
- 'Contact Name' => $dao->display_name,
- 'Source' => $dao->source,
- 'Start Date' => CRM_Utils_Date::customFormat($dao->start_date, $dateFormat),
- 'End Date' => CRM_Utils_Date::customFormat($dao->end_date, $dateFormat),
+ $rows[$arraykey]['rows'][$dao->civicrm_financial_item_id] = array(
+ 'Transaction' => $statuses[$dao->civicrm_financial_trxn_status_id],
+ 'Date of Transaction' => CRM_Utils_Date::customFormat($dao->civicrm_financial_trxn_trxn_date, $dateFormat),
+ 'Amount' => CRM_Utils_Money::format($dao->civicrm_financial_trxn_total_amount),
+ 'Contribution ID' => $dao->civicrm_contribution_id,
+ 'Item' => $dao->civicrm_financial_item_description,
+ 'Contact ID' => $dao->civicrm_contribution_contact_id,
+ 'Contact Name' => $dao->civicrm_contact_display_name,
+ 'Source' => $dao->civicrm_contribution_source,
+ 'Start Date' => CRM_Utils_Date::customFormat($dao->civicrm_membership_start_date, $dateFormat),
+ 'End Date' => CRM_Utils_Date::customFormat($dao->civicrm_membership_end_date, $dateFormat),
);
- $trxnDate = explode(',', $dao->trxn_date);
- $trxnAmount = explode(',', $dao->trxn_amount);
+ $trxnDate = explode(',', $dao->civicrm_financial_trxn_1_trxn_date);
+ $trxnAmount = explode(',', $dao->civicrm_financial_trxn_1_total_amount);
foreach ($trxnDate as $key => $date) {
$keyDate = date('M, Y', strtotime($date));
- $rows[$arraykey]['rows'][$dao->item_id][$keyDate] = CRM_Utils_Money::format($trxnAmount[$key]);
- $dateColumn[date('Ymd', strtotime($date))] = 1;
+ if (!array_key_exists($keyDate, $columns)) {
+ continue;
+ }
+ $rows[$arraykey]['rows'][$dao->civicrm_financial_item_id][$keyDate] = CRM_Utils_Money::format($trxnAmount[$key]);
}
}
- ksort($dateColumn);
- foreach ($dateColumn as $key => $ignore) {
- $columns[date('M, Y', strtotime($key))] = 1;
- }
$this->_columnHeaders = $columns;
}
- /**
- * @param $rows
- *
- */
- public function statistics(&$rows) {}
-
- /**
- * Alter display of rows.
- *
- * Iterate through the rows retrieved via SQL and make changes for display purposes,
- * such as rendering contacts as links.
- *
- * @param array $rows
- * Rows generated by SQL, with an array for each row.
- */
- public function alterDisplay(&$rows) {}
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Lybunt.php b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
index 63faa28c22..608e408f36 100644
--- a/civicrm/CRM/Report/Form/Contribute/Lybunt.php
+++ b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
@@ -581,6 +581,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
*/
public function buildQuery($applyLimit = TRUE) {
$this->buildGroupTempTable();
+ $this->buildPermissionClause();
// Calling where & select before FROM allows us to build temp tables to use in from.
$this->where();
$this->select();
diff --git a/civicrm/CRM/Report/Form/Contribute/Repeat.php b/civicrm/CRM/Report/Form/Contribute/Repeat.php
index f4b2483274..4d4472237b 100644
--- a/civicrm/CRM/Report/Form/Contribute/Repeat.php
+++ b/civicrm/CRM/Report/Form/Contribute/Repeat.php
@@ -683,7 +683,7 @@ LEFT JOIN $this->tempTableRepeat2 {$this->_aliases['civicrm_contribution']}2
public function statistics(&$rows) {
$statistics = parent::statistics($rows);
$sql = "{$this->_select} {$this->_from} {$this->_where}";
- $dao = CRM_Core_DAO::executeQuery($sql);
+ $dao = $this->executeReportQuery($sql);
//store contributions in array 'contact_sums' for comparison
$contact_sums = array();
while ($dao->fetch()) {
@@ -765,7 +765,7 @@ SELECT COUNT({$this->_aliases['civicrm_contribution']}1.total_amount_count )
$sql = "{$select} {$this->_from} {$this->_where}
GROUP BY currency
";
- $dao = CRM_Core_DAO::executeQuery($sql);
+ $dao = $this->executeReportQuery($sql);
$amount = $average = $amount2 = $average2 = array();
$count = $count2 = 0;
@@ -834,7 +834,7 @@ GROUP BY currency
$count = 0;
$sql = "{$this->_select} {$this->_from} {$this->_where} {$this->_groupBy} {$this->_limit}";
- $dao = CRM_Core_DAO::executeQuery($sql);
+ $dao = $this->executeReportQuery($sql);
$rows = array();
while ($dao->fetch()) {
foreach ($this->_columnHeaders as $key => $value) {
@@ -1033,10 +1033,10 @@ CREATE TEMPORARY TABLE $this->tempTableRepeat1 (
total_amount_sum int,
total_amount_count int
) ENGINE=HEAP {$this->_databaseAttributes}";
- CRM_Core_DAO::executeQuery($sql);
- CRM_Core_DAO::executeQuery("INSERT INTO $this->tempTableRepeat1 {$subContributionQuery1}");
+ $this->executeReportQuery($sql);
+ $this->executeReportQuery("INSERT INTO $this->tempTableRepeat1 {$subContributionQuery1}");
- CRM_Core_DAO::executeQuery("
+ $this->executeReportQuery("
ALTER TABLE $this->tempTableRepeat1 ADD INDEX ({$this->contributionJoinTableColumn})
");
@@ -1049,11 +1049,11 @@ total_amount_sum int,
total_amount_count int,
currency varchar(3)
) ENGINE=HEAP {$this->_databaseAttributes}";
- CRM_Core_DAO::executeQuery($sql);
+ $this->executeReportQuery($sql);
$sql = "INSERT INTO $this->tempTableRepeat2 {$subContributionQuery2}";
- CRM_Core_DAO::executeQuery($sql);
+ $this->executeReportQuery($sql);
- CRM_Core_DAO::executeQuery("
+ $this->executeReportQuery("
ALTER TABLE $this->tempTableRepeat2 ADD INDEX ({$this->contributionJoinTableColumn})
");
diff --git a/civicrm/CRM/Report/Form/Contribute/Summary.php b/civicrm/CRM/Report/Form/Contribute/Summary.php
index 9b59afb436..33cdec1e55 100644
--- a/civicrm/CRM/Report/Form/Contribute/Summary.php
+++ b/civicrm/CRM/Report/Form/Contribute/Summary.php
@@ -226,6 +226,24 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
),
),
),
+ 'civicrm_financial_trxn' => array(
+ 'dao' => 'CRM_Financial_DAO_FinancialTrxn',
+ 'fields' => array(
+ 'card_type' => array(
+ 'title' => ts('Credit Card Type'),
+ 'dbAlias' => 'GROUP_CONCAT(financial_trxn_civireport.card_type SEPARATOR ",")',
+ ),
+ ),
+ 'filters' => array(
+ 'card_type' => array(
+ 'title' => ts('Credit Card Type'),
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialTrxn', 'card_type'),
+ 'default' => NULL,
+ 'type' => CRM_Utils_Type::T_STRING,
+ ),
+ ),
+ ),
'civicrm_batch' => array(
'dao' => 'CRM_Batch_DAO_EntityBatch',
'grouping' => 'contri-fields',
@@ -514,6 +532,16 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
ON ({$this->_aliases['civicrm_batch']}.entity_id = eft.financial_trxn_id
AND {$this->_aliases['civicrm_batch']}.entity_table = 'civicrm_financial_trxn')";
}
+
+ // for credit card type
+ if ($this->isTableSelected('civicrm_financial_trxn')) {
+ $this->_from .= "
+ LEFT JOIN civicrm_entity_financial_trxn eftcc
+ ON ({$this->_aliases['civicrm_contribution']}.id = eftcc.entity_id AND
+ eftcc.entity_table = 'civicrm_contribution')
+ LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']}
+ ON {$this->_aliases['civicrm_financial_trxn']}.id = eftcc.financial_trxn_id";
+ }
}
/**
@@ -938,6 +966,11 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_
$entryFound = TRUE;
}
+ if (!empty($row['civicrm_financial_trxn_card_type'])) {
+ $rows[$rowNum]['civicrm_financial_trxn_card_type'] = $this->getLabels($row['civicrm_financial_trxn_card_type'], 'CRM_Financial_DAO_FinancialTrxn', 'card_type');
+ $entryFound = TRUE;
+ }
+
// If using campaigns, convert campaign_id to campaign title
if (array_key_exists('civicrm_contribution_campaign_id', $row)) {
if ($value = $row['civicrm_contribution_campaign_id']) {
diff --git a/civicrm/CRM/Report/Form/Event/Income.php b/civicrm/CRM/Report/Form/Event/Income.php
index 334faeb08e..f2f6f653b9 100644
--- a/civicrm/CRM/Report/Form/Event/Income.php
+++ b/civicrm/CRM/Report/Form/Event/Income.php
@@ -124,7 +124,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
WHERE civicrm_event.id IN( {$eventID}) {$groupBy}";
- $eventDAO = CRM_Core_DAO::executeQuery($sql);
+ $eventDAO = $this->executeReportQuery($sql);
$currency = array();
while ($eventDAO->fetch()) {
$eventSummary[$eventDAO->event_id]['Title'] = $eventDAO->event_title;
@@ -150,7 +150,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
GROUP BY civicrm_participant.event_id
";
- $counteDAO = CRM_Core_DAO::executeQuery($pariticipantCount);
+ $counteDAO = $this->executeReportQuery($pariticipantCount);
while ($counteDAO->fetch()) {
$count[$counteDAO->event_id] = $counteDAO->count;
}
@@ -170,7 +170,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
GROUP BY civicrm_participant.role_id, civicrm_participant.event_id, civicrm_participant.fee_currency
";
- $roleDAO = CRM_Core_DAO::executeQuery($role);
+ $roleDAO = $this->executeReportQuery($role);
while ($roleDAO->fetch()) {
// fix for multiple role, CRM-6507
@@ -214,7 +214,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
GROUP BY civicrm_participant.status_id, civicrm_participant.event_id
";
- $statusDAO = CRM_Core_DAO::executeQuery($status);
+ $statusDAO = $this->executeReportQuery($status);
while ($statusDAO->fetch()) {
$statusRows[$statusDAO->event_id][$participantStatus[$statusDAO->STATUSID]]['total'] = $statusDAO->participant;
@@ -244,7 +244,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
GROUP BY c.payment_instrument_id, civicrm_participant.event_id
";
- $instrumentDAO = CRM_Core_DAO::executeQuery($paymentInstrument);
+ $instrumentDAO = $this->executeReportQuery($paymentInstrument);
while ($instrumentDAO->fetch()) {
//allow only if instrument is present in contribution table
diff --git a/civicrm/CRM/Report/Form/Member/ContributionDetail.php b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
index 2fe10ce026..f21d1d5785 100644
--- a/civicrm/CRM/Report/Form/Member/ContributionDetail.php
+++ b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
@@ -580,6 +580,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
$this->tempTable();
$this->from();
$this->customDataFrom();
+ $this->buildPermissionClause();
$this->where();
$this->groupBy();
$this->orderBy();
diff --git a/civicrm/CRM/Tag/Form/Tag.php b/civicrm/CRM/Tag/Form/Tag.php
index 55ccd7514f..231fb43db0 100644
--- a/civicrm/CRM/Tag/Form/Tag.php
+++ b/civicrm/CRM/Tag/Form/Tag.php
@@ -99,17 +99,6 @@ class CRM_Tag_Form_Tag extends CRM_Core_Form {
$tags = new CRM_Core_BAO_Tag();
$tree = $tags->getTree($this->_entityTable, TRUE);
-
- // let's not load jstree if there are not children. This also fixes blank
- // display at the beginning of checkboxes
- $loadJsTree = CRM_Utils_Array::retrieveValueRecursive($tree, 'children');
- $this->assign('loadjsTree', FALSE);
- if (!empty($loadJsTree)) {
- CRM_Core_Resources::singleton()
- ->addScriptFile('civicrm', 'packages/jquery/plugins/jstree/jquery.jstree.js', 0, 'html-header', FALSE)
- ->addStyleFile('civicrm', 'packages/jquery/plugins/jstree/themes/default/style.css', 0, 'html-header');
- $this->assign('loadjsTree', TRUE);
- }
$this->assign('tree', $tree);
$this->assign('allTags', $allTags);
diff --git a/civicrm/CRM/UF/Form/Field.php b/civicrm/CRM/UF/Form/Field.php
index fce49b4c7d..73584503e7 100644
--- a/civicrm/CRM/UF/Form/Field.php
+++ b/civicrm/CRM/UF/Form/Field.php
@@ -789,7 +789,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
'Activity',
))
) {
- $errors['in_selector'] = ts("'In Selector' cannot be checked for %1 fields.", array(1 => $entityName));
+ $errors['in_selector'] = ts("'Results Column' cannot be checked for %1 fields.", array(1 => $entityName));
}
$isCustomField = FALSE;
diff --git a/civicrm/CRM/Upgrade/Incremental/Base.php b/civicrm/CRM/Upgrade/Incremental/Base.php
index fcf11235f8..a0a49c7ffd 100644
--- a/civicrm/CRM/Upgrade/Incremental/Base.php
+++ b/civicrm/CRM/Upgrade/Incremental/Base.php
@@ -149,4 +149,20 @@ class CRM_Upgrade_Incremental_Base {
return TRUE;
}
+ /**
+ * Drop a column from a table if it exist.
+ *
+ * @param CRM_Queue_TaskContext $ctx
+ * @param string $table
+ * @param string $column
+ * @return bool
+ */
+ public static function dropColumn($ctx, $table, $column) {
+ if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, $column)) {
+ CRM_Core_DAO::executeQuery("ALTER TABLE `$table` DROP COLUMN `$column`",
+ array(), TRUE, NULL, FALSE, FALSE);
+ }
+ return TRUE;
+ }
+
}
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
index 36b4313e9c..53083e06e0 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -307,6 +307,16 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
}
+ /**
+ * Upgrade function.
+ *
+ * @param string $rev
+ */
+ public function upgrade_4_7_18($rev) {
+ $this->addTask('Update Kenyan Provinces', 'updateKenyanProvinces');
+ $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+ }
+
/*
* Important! All upgrade functions MUST add a 'runSql' task.
* Uncomment and use the following template for a new upgrade version
@@ -983,4 +993,56 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_
return TRUE;
}
+ /**
+ * Update Kenyan Provinces to reflect changes per CRM-20062
+ *
+ * @param \CRM_Queue_TaskContext $ctx
+ */
+ public function updateKenyanProvinces(CRM_Queue_TaskContext $ctx) {
+ $kenyaCountryID = CRM_Core_DAO::singleValueQuery('SELECT max(id) from civicrm_country where iso_code = "KE"');
+ $oldProvinces = array(
+ 'Nairobi Municipality',
+ 'Coast',
+ 'North-Eastern Kaskazini Mashariki',
+ 'Rift Valley',
+ 'Western Magharibi',
+ );
+ self::deprecateStateProvinces($kenyaCountryID, $oldProvinces);
+ return TRUE;
+ }
+
+ /**
+ * Deprecate provinces that no longer exist.
+ *
+ * @param int $countryID
+ * @param array $provinces
+ */
+ public static function deprecateStateProvinces($countryID, $provinces) {
+ foreach ($provinces as $province) {
+ $existingStateID = CRM_Core_DAO::singleValueQuery("
+ SELECT id FROM civicrm_state_province
+ WHERE country_id = %1
+ AND name = %2
+ ",
+ array(1 => array($countryID, 'Int'), 2 => array($province, 'String')));
+
+ if (!$existingStateID) {
+ continue;
+ }
+ if (!CRM_Core_DAO::singleValueQuery("
+ SELECT count(*) FROM civicrm_address
+ WHERE state_province_id = %1
+ ", array(1 => array($existingStateID, 'Int')))
+ ) {
+ CRM_Core_DAO::executeQuery("DELETE FROM civicrm_state_province WHERE id = %1", array(1 => array($existingStateID, 'Int')));
+ }
+ else {
+ $params = array('1' => array(ts("Former - $province"), 'String'));
+ CRM_Core_DAO::executeQuery("
+ UPDATE civicrm_state_province SET name = %1 WHERE id = $existingStateID
+ ", $params);
+ }
+ }
+ }
+
}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl
new file mode 100644
index 0000000000..d2ebea11ad
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl
@@ -0,0 +1,79 @@
+{* file to handle db changes in 4.7.18 during upgrade *}
+
+-- CRM-20062 New counties of Kenya.
+SELECT @country_id := max(id) from civicrm_country where iso_code = "KE";
+INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES
+(@country_id, "01", "Baringo"),
+(@country_id, "02", "Bomet"),
+(@country_id, "03", "Bungoma"),
+(@country_id, "04", "Busia"),
+(@country_id, "05", "Elgeyo/Marakwet"),
+(@country_id, "06", "Embu"),
+(@country_id, "07", "Garissa"),
+(@country_id, "08", "Homa Bay"),
+(@country_id, "09", "Isiolo"),
+(@country_id, "10", "Kajiado"),
+(@country_id, "11", "Kakamega"),
+(@country_id, "12", "Kericho"),
+(@country_id, "13", "Kiambu"),
+(@country_id, "14", "Kilifi"),
+(@country_id, "15", "Kirinyaga"),
+(@country_id, "16", "Kisii"),
+(@country_id, "17", "Kisumu"),
+(@country_id, "18", "Kitui"),
+(@country_id, "19", "Kwale"),
+(@country_id, "20", "Laikipia"),
+(@country_id, "21", "Lamu"),
+(@country_id, "22", "Machakos"),
+(@country_id, "23", "Makueni"),
+(@country_id, "24", "Mandera"),
+(@country_id, "25", "Marsabit"),
+(@country_id, "26", "Meru"),
+(@country_id, "27", "Migori"),
+(@country_id, "28", "Mombasa"),
+(@country_id, "29", "Murang'a"),
+(@country_id, "30", "Nairobi City"),
+(@country_id, "31", "Nakuru"),
+(@country_id, "32", "Nandi"),
+(@country_id, "33", "Narok"),
+(@country_id, "34", "Nyamira"),
+(@country_id, "35", "Nyandarua"),
+(@country_id, "36", "Nyeri"),
+(@country_id, "37", "Samburu"),
+(@country_id, "38", "Siaya"),
+(@country_id, "39", "Taita/Taveta"),
+(@country_id, "40", "Tana River"),
+(@country_id, "41", "Tharaka-Nithi"),
+(@country_id, "42", "Trans Nzoia"),
+(@country_id, "43", "Turkana"),
+(@country_id, "44", "Uasin Gishu"),
+(@country_id, "45", "Vihiga"),
+(@country_id, "46", "Wajir"),
+(@country_id, "47", "West Pokot");
+
+-- CRM-19993 Fixes for ISO compliance with countries and counties
+INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES
+(NULL, 1101, "CH", "Chandigarh"),
+(NULL, 1083, "CP", "Central"),
+(NULL, 1083, "EP", "Eastern"),
+(NULL, 1083, "NP", "Northern"),
+(NULL, 1083, "WP", "Western"),
+(NULL, 1181, "K", "Saint Kitts"),
+(NULL, 1181, "N", "Nevis"),
+(NULL, 1190, "E", "Eastern"),
+(NULL, 1190, "N", "Northern"),
+(NULL, 1190, "S", "Southern");
+
+UPDATE `civicrm_state_province` SET `name`='Uttarakhand', `abbreviation`='UT' WHERE `name` = 'Uttaranchal' AND `abbreviation`='UL';
+UPDATE `civicrm_state_province` SET `name`='Yunlin County' WHERE `name` = 'Yunlin Conuty';
+UPDATE `civicrm_country` SET `name`='Palestine, State of' WHERE `name` = 'Palestinian Territory';
+UPDATE `civicrm_country` SET `name`='Virgin Islands, British' WHERE `name` = 'Virgin Islands,British';
+
+-- CRM-20102 make case_type_id required
+ALTER TABLE `civicrm_case` DROP FOREIGN KEY `FK_civicrm_case_case_type_id`;
+ALTER TABLE `civicrm_case` MODIFY `case_type_id` int(10) unsigned NOT NULL COMMENT 'FK to civicrm_case_type.id';
+ALTER TABLE `civicrm_case` ADD CONSTRAINT `FK_civicrm_case_case_type_id` FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type` (`id`);
+
+--- CRM-19715 Remove Close Accounting Period code - now in an extension.
+DELETE FROM civicrm_navigation
+WHERE url = 'civicrm/admin/contribute/closeaccperiod?reset=1' AND name = 'Close Accounting Period';
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
index a7fca7aced..146fbcefb9 100644
--- a/civicrm/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
+++ b/civicrm/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
@@ -15,8 +15,3 @@ SELECT @contributionNavId := id, @domainID := domain_id FROM civicrm_navigation
SELECT @navMaxWeight := MAX(ROUND(weight))+1 from civicrm_navigation WHERE parent_id = @contributionNavId;
UPDATE civicrm_navigation SET has_separator = 1 WHERE name = 'Manage Price Sets' AND parent_id = @contributionNavId;
-
-INSERT INTO civicrm_navigation
- (domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight)
-VALUES
- (@domainID, 'civicrm/admin/contribute/closeaccperiod?reset=1', '{ts escape="sql" skip="true"}Close Accounting Period{/ts}', 'Close Accounting Period', 'access CiviContribute,administer CiviCRM,administer Accounting', 'AND', @contributionNavId, '1', NULL, @navMaxWeight);
diff --git a/civicrm/CRM/Utils/Array.php b/civicrm/CRM/Utils/Array.php
index 54c567e9e1..3664a96477 100644
--- a/civicrm/CRM/Utils/Array.php
+++ b/civicrm/CRM/Utils/Array.php
@@ -925,17 +925,17 @@ class CRM_Utils_Array {
}
/**
- * Rewrite the keys in an array by filtering through a function.
+ * Rewrite the keys in an array.
*
* @param array $array
- * @param callable $func
- * Function($key, $value). Returns the new key.
+ * @param string|callable $indexBy
+ * Either the value to key by, or a function($key, $value) that returns the new key.
* @return array
*/
- public static function rekey($array, $func) {
+ public static function rekey($array, $indexBy) {
$result = array();
foreach ($array as $key => $value) {
- $newKey = $func($key, $value);
+ $newKey = is_callable($indexBy) ? $indexBy($key, $value) : $value[$indexBy];
$result[$newKey] = $value;
}
return $result;
diff --git a/civicrm/CRM/Utils/Date.php b/civicrm/CRM/Utils/Date.php
index 3d8ed11f93..a533c16d93 100644
--- a/civicrm/CRM/Utils/Date.php
+++ b/civicrm/CRM/Utils/Date.php
@@ -939,21 +939,21 @@ class CRM_Utils_Date {
}
/**
- * Check given format is valid for bith date.
- * and retrun supportable birth date format w/ qf mapping.
+ * Get the smarty view presentation mapping for the given format.
+ *
+ * Historically it was decided that where the view format is 'dd/mm/yy' or 'mm/dd/yy'
+ * they should be rendered using a longer date format. This is likely as much to
+ * do with the earlier date widget being unable to handle some formats as usablity.
+ * However, we continue to respect this.
*
* @param $format
* Given format ( eg 'M Y', 'Y M' ).
- * return array of qfMapping and date parts for date format.
*
- * @return array|null|string
+ * @return string|null
+ * Smarty translation of the date format. Null is also valid and is translated
+ * according to the available parts at the smarty layer.
*/
- public static function &checkBirthDateFormat($format = NULL) {
- $birthDateFormat = NULL;
- if (!$format) {
- $birthDateFormat = self::getDateFormat('birth');
- }
-
+ public static function getDateFieldViewFormat($format) {
$supportableFormats = array(
'mm/dd' => '%B %E%f',
'dd-mm' => '%E%f %B',
@@ -963,11 +963,57 @@ class CRM_Utils_Date {
'dd/mm/yy' => '%E%f %B %Y',
);
- if (array_key_exists($birthDateFormat, $supportableFormats)) {
- $birthDateFormat = array('qfMapping' => $supportableFormats[$birthDateFormat]);
+ return array_key_exists($format, $supportableFormats) ? $supportableFormats[$format] : self::pickBestSmartyFormat($format);
+ }
+
+ /**
+ * Pick the smarty format from settings that best matches the time string we have.
+ *
+ * For view purposes we historically use the setting that most closely matches the data
+ * in the format from our settings, as opposed to the setting configured for the field.
+ *
+ * @param $format
+ * @return mixed
+ */
+ public static function pickBestSmartyFormat($format) {
+ if (stristr($format, 'h')) {
+ return Civi::settings()->get('dateformatDatetime');
+ }
+ if (stristr($format, 'd') || stristr($format, 'j')) {
+ return Civi::settings()->get('dateformatFull');
}
+ if (stristr($format, 'm')) {
+ return Civi::settings()->get('dateformatPartial');
+ }
+ return Civi::settings()->get('dateformatYear');
+ }
- return $birthDateFormat;
+ /**
+ * Map date plugin and actual format that is used by PHP.
+ *
+ * @return array
+ */
+ public static function datePluginToPHPFormats() {
+ $dateInputFormats = array(
+ "mm/dd/yy" => 'm/d/Y',
+ "dd/mm/yy" => 'd/m/Y',
+ "yy-mm-dd" => 'Y-m-d',
+ "dd-mm-yy" => 'd-m-Y',
+ "dd.mm.yy" => 'd.m.Y',
+ "M d" => 'M j',
+ "M d, yy" => 'M j, Y',
+ "d M yy" => 'j M Y',
+ "MM d, yy" => 'F j, Y',
+ "d MM yy" => 'j F Y',
+ "DD, d MM yy" => 'l, j F Y',
+ "mm/dd" => 'm/d',
+ "dd-mm" => 'd-m',
+ "yy-mm" => 'Y-m',
+ "M yy" => 'M Y',
+ "M Y" => 'M Y',
+ "yy" => 'Y',
+ );
+ return $dateInputFormats;
}
/**
@@ -1741,27 +1787,6 @@ class CRM_Utils_Date {
return $mysqlDate;
}
- /**
- * Convert a Civi-special date string to a standard php date string.
- *
- * For historical reasons CiviCRM has it's own (possibly Smarty derived)
- * format for defined date strings. This renders something php can use.
- *
- * @param string $dateFormatString
- * e.g mm/dd/yy
- * These map to the values used in the date_format field in civicrm_custom_field.date_format.
- *
- * @return string
- * A proper php strotime formatted equivalent of the string.
- * eg m/d/y for the above.
- *
- * http://php.net/manual/en/function.strtotime.php
- */
- public static function getPhpDateFormatFromInputStyleDateFormat($dateFormatString) {
- $formats = CRM_Core_SelectValues::datePluginToPHPFormats();
- return $formats[$dateFormatString];
- }
-
/**
* Add the metadata about a date field to the field.
*
@@ -1783,10 +1808,7 @@ class CRM_Utils_Date {
$field['date_format'] = $dateAttributes['format'];
$field['is_datetime_field'] = TRUE;
$field['time_format'] = $dateAttributes['time'];
- $field['php_datetime_format'] = CRM_Utils_Date::getPhpDateFormatFromInputStyleDateFormat($field['date_format']);
- if ($field['time_format']) {
- $field['php_datetime_format'] .= ' H-i-s';
- }
+ $field['smarty_view_format'] = $dateAttributes['smarty_view_format'];
}
$field['datepicker']['extra'] = self::getDatePickerExtra($field);
$field['datepicker']['attributes'] = self::getDatePickerAttributes($field);
diff --git a/civicrm/CRM/Utils/File.php b/civicrm/CRM/Utils/File.php
index c5906f4b90..fec063d9e7 100644
--- a/civicrm/CRM/Utils/File.php
+++ b/civicrm/CRM/Utils/File.php
@@ -140,7 +140,7 @@ class CRM_Utils_File {
*/
public static function cleanDir($target, $rmdir = TRUE, $verbose = TRUE) {
static $exceptions = array('.', '..');
- if ($target == '' || $target == '/') {
+ if ($target == '' || $target == '/' || !$target) {
throw new Exception("Overly broad deletion");
}
diff --git a/civicrm/CRM/Utils/Geocode/Google.php b/civicrm/CRM/Utils/Geocode/Google.php
index db01763639..bdb4a31a33 100644
--- a/civicrm/CRM/Utils/Geocode/Google.php
+++ b/civicrm/CRM/Utils/Geocode/Google.php
@@ -82,7 +82,7 @@ class CRM_Utils_Geocode_Google {
$add .= ',+';
}
- if (!empty($values['state_province'])) {
+ if (!empty($values['state_province']) || !empty($values['state_province_id'])) {
if (!empty($values['state_province_id'])) {
$stateProvince = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $values['state_province_id']);
}
diff --git a/civicrm/CRM/Utils/Geocode/Yahoo.php b/civicrm/CRM/Utils/Geocode/Yahoo.php
index 2300026e56..4d18690340 100644
--- a/civicrm/CRM/Utils/Geocode/Yahoo.php
+++ b/civicrm/CRM/Utils/Geocode/Yahoo.php
@@ -79,7 +79,7 @@ class CRM_Utils_Geocode_Yahoo {
$whereComponents['city'] = $city;
}
- if (!empty($values['state_province'])) {
+ if (!empty($values['state_province']) || !empty($values['state_province_id'])) {
if (!empty($values['state_province_id'])) {
$stateProvince = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $values['state_province_id']);
}
diff --git a/civicrm/CRM/Utils/Hook/UnitTests.php b/civicrm/CRM/Utils/Hook/UnitTests.php
index eb529aa901..fba73256c2 100644
--- a/civicrm/CRM/Utils/Hook/UnitTests.php
+++ b/civicrm/CRM/Utils/Hook/UnitTests.php
@@ -52,6 +52,7 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
* Use a unit-testing mock object to handle hook invocations.
*
* e.g. hook_civicrm_foo === $mockObject->foo()
+ * Mocks with a magic `__call()` method are called for every hook invokation.
*
* @param object $mockObject
*/
@@ -60,7 +61,7 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
}
/**
- * Register a piece of code to run when invoking a hook.
+ * Register a function to run when invoking a specific hook.
* @param string $hook
* Hook name, e.g civicrm_pre.
* @param array $callable
@@ -72,7 +73,7 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
}
/**
- * Invoke hooks.
+ * Invoke standard, mock and ad hoc hooks.
*
* @param int $numParams
* Number of parameters to pass to the hook.
@@ -93,34 +94,22 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
*
* @return mixed
*/
- /**
- * @param int $numParams
- * @param mixed $arg1
- * @param mixed $arg2
- * @param mixed $arg3
- * @param mixed $arg4
- * @param mixed $arg5
- * @param mixed $arg6
- * @param string $fnSuffix
- *
- * @return mixed
- */
public function invoke(
$numParams,
&$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
$fnSuffix) {
-
$params = array(&$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6);
-
+ // run standard hooks
if ($this->civiModules === NULL) {
$this->civiModules = array();
$this->requireCiviModules($this->civiModules);
}
$this->runHooks($this->civiModules, $fnSuffix, $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
-
+ // run mock object hooks
if ($this->mockObject && is_callable(array($this->mockObject, $fnSuffix))) {
call_user_func(array($this->mockObject, $fnSuffix), $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
}
+ // run adhoc hooks
if (!empty($this->adhocHooks[$fnSuffix])) {
call_user_func_array($this->adhocHooks[$fnSuffix], $params);
}
diff --git a/civicrm/CRM/Utils/Hook/WordPress.php b/civicrm/CRM/Utils/Hook/WordPress.php
index 47164d3952..977a746c23 100644
--- a/civicrm/CRM/Utils/Hook/WordPress.php
+++ b/civicrm/CRM/Utils/Hook/WordPress.php
@@ -179,7 +179,7 @@ class CRM_Utils_Hook_WordPress extends CRM_Utils_Hook {
if (!empty($config->customPHPPathDir) &&
file_exists("{$config->customPHPPathDir}/civicrmHooks.php")
) {
- @include_once 'civicrmHooks.php';
+ @include_once "{$config->customPHPPathDir}/civicrmHooks.php";
}
// initialise with the pre-existing 'wordpress' prefix
diff --git a/civicrm/CRM/Utils/HttpClient.php b/civicrm/CRM/Utils/HttpClient.php
index bb042668ce..b0900f28a5 100644
--- a/civicrm/CRM/Utils/HttpClient.php
+++ b/civicrm/CRM/Utils/HttpClient.php
@@ -92,17 +92,12 @@ class CRM_Utils_HttpClient {
$fp = @fopen($localFile, "w");
if (!$fp) {
- // Fixme: throw error instead of setting message
- CRM_Core_Session::setStatus(ts('Unable to write to %1.<br />Is the location writable?', array(1 => $localFile)), ts('Write Error'), 'error');
return self::STATUS_WRITE_ERROR;
}
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_exec($ch);
if (curl_errno($ch)) {
- // Fixme: throw error instead of setting message
- CRM_Core_Session::setStatus(ts('Unable to download extension from %1. Error Message: %2',
- array(1 => $remoteFile, 2 => curl_error($ch))), ts('Extension download error'), 'error');
return self::STATUS_DL_ERROR;
}
else {
diff --git a/civicrm/CRM/Utils/Mail/EmailProcessor.php b/civicrm/CRM/Utils/Mail/EmailProcessor.php
index 2e8c14a991..3acb4a68fb 100644
--- a/civicrm/CRM/Utils/Mail/EmailProcessor.php
+++ b/civicrm/CRM/Utils/Mail/EmailProcessor.php
@@ -44,22 +44,18 @@ class CRM_Utils_Mail_EmailProcessor {
/**
* Process the default mailbox (ie. that is used by civiMail for the bounce)
*
- * @return bool
- * Always returns true (for the api). at a later stage we should
- * fix this to return true on success / false on failure etc.
+ * @param bool $is_create_activities
+ * Should activities be created
*/
- public static function processBounces() {
+ public static function processBounces($is_create_activities) {
$dao = new CRM_Core_DAO_MailSettings();
$dao->domain_id = CRM_Core_Config::domainID();
$dao->is_default = TRUE;
$dao->find();
while ($dao->fetch()) {
- self::_process(TRUE, $dao);
+ self::_process(TRUE, $dao, $is_create_activities);
}
-
- // always returns true, i.e. never fails :)
- return TRUE;
}
/**
@@ -102,7 +98,7 @@ class CRM_Utils_Mail_EmailProcessor {
$found = FALSE;
while ($dao->fetch()) {
$found = TRUE;
- self::_process(FALSE, $dao);
+ self::_process(FALSE, $dao, $is_create_activities);
}
if (!$found) {
CRM_Core_Error::fatal(ts('No mailboxes have been configured for Email to Activity Processing'));
@@ -128,10 +124,12 @@ class CRM_Utils_Mail_EmailProcessor {
/**
* @param $civiMail
* @param CRM_Core_DAO $dao
+ * @param bool $is_create_activities
+ * Create activities.
*
* @throws Exception
*/
- public static function _process($civiMail, $dao) {
+ public static function _process($civiMail, $dao, $is_create_activities) {
// 0 = activities; 1 = bounce;
$usedfor = $dao->is_default;
@@ -234,7 +232,7 @@ class CRM_Utils_Mail_EmailProcessor {
}
// preseve backward compatibility
- if ($usedfor == 0 || !$civiMail) {
+ if ($usedfor == 0 || $is_create_activities) {
// if its the activities that needs to be processed ..
try {
$mailParams = CRM_Utils_Mail_Incoming::parseMailingObject($mail);
diff --git a/civicrm/CRM/Utils/Rule.php b/civicrm/CRM/Utils/Rule.php
index 034bec2116..a40286d4b5 100644
--- a/civicrm/CRM/Utils/Rule.php
+++ b/civicrm/CRM/Utils/Rule.php
@@ -138,6 +138,21 @@ class CRM_Utils_Rule {
* @return bool
*/
public static function mysqlOrderBy($str) {
+ $matches = array();
+ // Using the field function in order by is valid.
+ // Look for a string like field(contribution_status_id,3,4,6).
+ // or field(civicrm_contribution.contribution_status_id,3,4,6)
+ if (preg_match('/field\([a-z_.]+,[0-9,]+\)/', $str, $matches)) {
+ // We have checked these. Remove them as they will fail the next lot.
+ // Our check currently only permits numbers & no back ticks. If we get a
+ // need for strings or backticks we can add.
+ $str = str_replace($matches, '', $str);
+ }
+ $str = trim($str);
+ if (!empty($matches) && empty($str)) {
+ // nothing left to check after the field check.
+ return TRUE;
+ }
// Making a regex for a comma separated list is quite hard and not readable
// at all, so we split and loop over.
$parts = explode(',', $str);
diff --git a/civicrm/CRM/Utils/System/Drupal8.php b/civicrm/CRM/Utils/System/Drupal8.php
index 475490bb3c..8d931aa045 100644
--- a/civicrm/CRM/Utils/System/Drupal8.php
+++ b/civicrm/CRM/Utils/System/Drupal8.php
@@ -617,4 +617,20 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
);
}
+ /**
+ * Drupal 8 has a different function to get current path, hence
+ * overriding the postURL function
+ *
+ * @param string $action
+ *
+ * @return string
+ */
+ public function postURL($action) {
+ if (!empty($action)) {
+ return $action;
+ }
+ $current_path = \Drupal::service('path.current')->getPath();
+ return $this->url($current_path);
+ }
+
}
diff --git a/civicrm/CRM/Utils/System/DrupalBase.php b/civicrm/CRM/Utils/System/DrupalBase.php
index 54beb6fedf..c0ce0f49c1 100644
--- a/civicrm/CRM/Utils/System/DrupalBase.php
+++ b/civicrm/CRM/Utils/System/DrupalBase.php
@@ -252,7 +252,7 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
'cms:view user account',
))
) {
- return url('user/' . $uid);
+ return $this->url('user/' . $uid);
};
}
diff --git a/civicrm/CRM/Utils/Type.php b/civicrm/CRM/Utils/Type.php
index 65b726c98f..43b920f8be 100644
--- a/civicrm/CRM/Utils/Type.php
+++ b/civicrm/CRM/Utils/Type.php
@@ -312,7 +312,33 @@ class CRM_Utils_Type {
case 'MysqlOrderBy':
if (CRM_Utils_Rule::mysqlOrderBy($data)) {
$parts = explode(',', $data);
- foreach ($parts as &$part) {
+
+ // The field() syntax is tricky here because it uses commas & when
+ // we separate by them we break it up. But we want to keep the clauses in order.
+ // so we just clumsily re-assemble it. Test cover exists.
+ $fieldClauseStart = NULL;
+ foreach ($parts as $index => &$part) {
+ if (substr($part, 0, 6) === 'field(') {
+ // Looking to escape a string like 'field(contribution_status_id,3,4,5) asc'
+ // to 'field(`contribution_status_id`,3,4,5) asc'
+ $fieldClauseStart = $index;
+ continue;
+ }
+ if ($fieldClauseStart !== NULL) {
+ // this is part of the list of field options. Concatenate it back on.
+ $parts[$fieldClauseStart] .= ',' . $part;
+ unset($parts[$index]);
+ if (!strstr($parts[$fieldClauseStart], ')')) {
+ // we have not reached the end of the list.
+ continue;
+ }
+ // We have the last piece of the field() clause, time to escape it.
+ $parts[$fieldClauseStart] = self::mysqlOrderByFieldFunctionCallback($parts[$fieldClauseStart]);
+ $fieldClauseStart = NULL;
+ continue;
+
+ }
+ // Normal clause.
$part = preg_replace_callback('/^(?:(?:((?:`[\w-]{1,64}`|[\w-]{1,64}))(?:\.))?(`[\w-]{1,64}`|[\w-]{1,64})(?: (asc|desc))?)$/i', array('CRM_Utils_Type', 'mysqlOrderByCallback'), trim($part));
}
return implode(', ', $parts);
@@ -453,6 +479,19 @@ class CRM_Utils_Type {
return NULL;
}
+ /**
+ * Preg_replace_callback for mysqlOrderByFieldFunction escape.
+ *
+ * Add backticks around the field name.
+ *
+ * @param string $clause
+ *
+ * @return string
+ */
+ public static function mysqlOrderByFieldFunctionCallback($clause) {
+ return preg_replace('/field\((\w*)/', 'field(`${1}`', $clause);
+ }
+
/**
* preg_replace_callback for MysqlOrderBy escape.
*/
diff --git a/civicrm/Civi/API/Api3SelectQuery.php b/civicrm/Civi/API/Api3SelectQuery.php
index 77bdd1b4b7..1585b152b1 100644
--- a/civicrm/Civi/API/Api3SelectQuery.php
+++ b/civicrm/Civi/API/Api3SelectQuery.php
@@ -106,7 +106,7 @@ class Api3SelectQuery extends SelectQuery {
continue;
}
$operator = is_array($value) ? \CRM_Utils_Array::first(array_keys($value)) : NULL;
- if (!in_array($operator, \CRM_Core_DAO::acceptedSQLOperators())) {
+ if (!in_array($operator, \CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
$value = array('=' => $value);
}
$filters[$key] = \CRM_Core_DAO::createSQLFilter("{$table_name}.{$column_name}", $value);
diff --git a/civicrm/Civi/API/Events.php b/civicrm/Civi/API/Events.php
index c6abcb011f..1dd7349278 100644
--- a/civicrm/Civi/API/Events.php
+++ b/civicrm/Civi/API/Events.php
@@ -45,7 +45,7 @@ class Events {
*
* @see AuthorizeEvent
*/
- const AUTHORIZE = 'api.authorize';
+ const AUTHORIZE = 'civi.api.authorize';
/**
* Determine which API provider executes the given request. For successful
@@ -54,28 +54,28 @@ class Events {
*
* @see ResolveEvent
*/
- const RESOLVE = 'api.resolve';
+ const RESOLVE = 'civi.api.resolve';
/**
* Apply pre-execution logic
*
* @see PrepareEvent
*/
- const PREPARE = 'api.prepare';
+ const PREPARE = 'civi.api.prepare';
/**
* Apply post-execution logic
*
* @see RespondEvent
*/
- const RESPOND = 'api.respond';
+ const RESPOND = 'civi.api.respond';
/**
* Handle any exceptions.
*
* @see ExceptionEvent
*/
- const EXCEPTION = 'api.exception';
+ const EXCEPTION = 'civi.api.exception';
/**
* Weight - Early
diff --git a/civicrm/Civi/API/ExternalBatch.php b/civicrm/Civi/API/ExternalBatch.php
index 5e48a4a3f8..6a8d463e14 100644
--- a/civicrm/Civi/API/ExternalBatch.php
+++ b/civicrm/Civi/API/ExternalBatch.php
@@ -52,7 +52,7 @@ class ExternalBatch {
$this->settingsPath = defined('CIVICRM_SETTINGS_PATH') ? CIVICRM_SETTINGS_PATH : NULL;
$this->defaultParams = $defaultParams;
$this->env = $_ENV;
- if (empty($_ENV)) {
+ if (empty($_ENV['PATH'])) {
// FIXME: If we upgrade to newer Symfony\Process and use the newer
// inheritEnv feature, then this becomes unnecessary.
throw new \CRM_Core_Exception('ExternalBatch cannot detect environment: $_ENV is missing. (Tip: Set variables_order=EGPCS in php.ini.)');
diff --git a/civicrm/Civi/API/Subscriber/WrapperAdapter.php b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
index 00274a932f..9340b3b720 100644
--- a/civicrm/Civi/API/Subscriber/WrapperAdapter.php
+++ b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
@@ -33,7 +33,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
* This is a wrapper for the legacy "API Wrapper" interface which allows
* wrappers to run through the new kernel. It translates from dispatcher events
- * ('api.prepare', 'api.respond') to wrapper calls ('fromApiInput', 'toApiOutput').
+ * ('civi.api.prepare', 'civi.api.respond') to wrapper calls ('fromApiInput', 'toApiOutput').
*/
class WrapperAdapter implements EventSubscriberInterface {
diff --git a/civicrm/Civi/ActionSchedule/Events.php b/civicrm/Civi/ActionSchedule/Events.php
index 15e49f71db..3ff1a385e1 100644
--- a/civicrm/Civi/ActionSchedule/Events.php
+++ b/civicrm/Civi/ActionSchedule/Events.php
@@ -8,12 +8,12 @@ class Events {
*
* @see EntityListEvent
*/
- const MAPPINGS = 'actionSchedule.getMappings';
+ const MAPPINGS = 'civi.actionSchedule.getMappings';
/**
* Prepare the pre-mailing query. This query loads details about
* the contact/entity so that they're available for mail-merge.
*/
- const MAILING_QUERY = 'actionSchedule.prepareMailingQuery';
+ const MAILING_QUERY = 'civi.actionSchedule.prepareMailingQuery';
}
diff --git a/civicrm/Civi/Core/Container.php b/civicrm/Civi/Core/Container.php
index 76076375a6..d95b62aac1 100644
--- a/civicrm/Civi/Core/Container.php
+++ b/civicrm/Civi/Core/Container.php
@@ -245,9 +245,9 @@ class Container {
$dispatcher->addListener('hook_civicrm_post::Case', array('\Civi\CCase\Events', 'fireCaseChange'));
$dispatcher->addListener('hook_civicrm_caseChange', array('\Civi\CCase\Events', 'delegateToXmlListeners'));
$dispatcher->addListener('hook_civicrm_caseChange', array('\Civi\CCase\SequenceListener', 'onCaseChange_static'));
- $dispatcher->addListener('DAO::post-insert', array('\CRM_Core_BAO_RecurringEntity', 'triggerInsert'));
- $dispatcher->addListener('DAO::post-update', array('\CRM_Core_BAO_RecurringEntity', 'triggerUpdate'));
- $dispatcher->addListener('DAO::post-delete', array('\CRM_Core_BAO_RecurringEntity', 'triggerDelete'));
+ $dispatcher->addListener('civi.dao.postInsert', array('\CRM_Core_BAO_RecurringEntity', 'triggerInsert'));
+ $dispatcher->addListener('civi.dao.postUpdate', array('\CRM_Core_BAO_RecurringEntity', 'triggerUpdate'));
+ $dispatcher->addListener('civi.dao.postDelete', array('\CRM_Core_BAO_RecurringEntity', 'triggerDelete'));
$dispatcher->addListener('hook_civicrm_unhandled_exception', array(
'CRM_Core_LegacyErrorHandler',
'handleException',
diff --git a/civicrm/Civi/Install/Requirements.php b/civicrm/Civi/Install/Requirements.php
index 5677d970a9..ad0848e80b 100644
--- a/civicrm/Civi/Install/Requirements.php
+++ b/civicrm/Civi/Install/Requirements.php
@@ -101,6 +101,24 @@ class Requirements {
return $errors;
}
+ /**
+ * Generates a mysql connection
+ *
+ * @param $db_confic array
+ * @return object mysqli connection
+ */
+ protected function connect($db_config) {
+ $host = NULL;
+ if (!empty($db_config['host'])) {
+ $host = $db_config['host'];
+ }
+ elseif (!empty($db_config['server'])) {
+ $host = $db_config['server'];
+ }
+ $conn = @mysqli_connect($host, $db_config['username'], $db_config['password'], $db_config['database'], !empty($db_config['port']) ? $db_config['port'] : NULL);
+ return $conn;
+ }
+
/**
* Check configured php Memory.
* @return array
@@ -227,8 +245,7 @@ class Requirements {
'details' => "Connected",
);
- $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host'];
- $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['details'] = mysqli_connect_error();
@@ -257,8 +274,7 @@ class Requirements {
'severity' => $this::REQUIREMENT_OK,
);
- $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host'];
- $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn || !($info = mysqli_get_server_info($conn))) {
$results['severity'] = $this::REQUIREMENT_WARNING;
$results['details'] = "Cannot determine the version of MySQL installed. Please ensure at least version {$min} is installed.";
@@ -287,7 +303,7 @@ class Requirements {
'details' => 'Could not determine if MySQL has InnoDB support. Assuming none.',
);
- $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
return $results;
}
@@ -322,7 +338,7 @@ class Requirements {
'details' => 'MySQL server supports temporary tables',
);
- $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['severity'] = $this::REQUIREMENT_ERROR;
$results['details'] = "Could not connect to database";
@@ -358,7 +374,7 @@ class Requirements {
'details' => 'Database supports MySQL triggers',
);
- $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['severity'] = $this::REQUIREMENT_ERROR;
$results['details'] = 'Could not connect to database';
@@ -403,7 +419,7 @@ class Requirements {
'details' => 'MySQL server auto_increment_increment is 1',
);
- $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['severity'] = $this::REQUIREMENT_ERROR;
$results['details'] = 'Could not connect to database';
@@ -439,8 +455,7 @@ class Requirements {
'details' => 'MySQL thread_stack is OK',
);
- $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host'];
- $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['severity'] = $this::REQUIREMENT_ERROR;
$results['details'] = 'Could not connect to database';
@@ -481,8 +496,7 @@ class Requirements {
'details' => 'Can successfully lock and unlock tables',
);
- $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host'];
- $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']);
+ $conn = $this->connect($db_config);
if (!$conn) {
$results['severity'] = $this::REQUIREMENT_ERROR;
$results['details'] = 'Could not connect to database';
diff --git a/civicrm/Civi/Test/CiviTestListener.php b/civicrm/Civi/Test/CiviTestListener.php
index 3bd6f0dbc5..d923fad9c9 100644
--- a/civicrm/Civi/Test/CiviTestListener.php
+++ b/civicrm/Civi/Test/CiviTestListener.php
@@ -95,10 +95,10 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
$test->setUpHeadless();
- $config = \CRM_Core_Config::singleton(TRUE, TRUE); // ugh, performance
\CRM_Utils_System::flushCache();
\Civi::reset();
\CRM_Core_Session::singleton()->set('userID', NULL);
+ $config = \CRM_Core_Config::singleton(TRUE, TRUE); // ugh, performance
if (property_exists($config->userPermissionClass, 'permissions')) {
$config->userPermissionClass->permissions = NULL;
diff --git a/civicrm/Civi/Token/TokenCompatSubscriber.php b/civicrm/Civi/Token/TokenCompatSubscriber.php
index ccd70813bf..d00acd7509 100644
--- a/civicrm/Civi/Token/TokenCompatSubscriber.php
+++ b/civicrm/Civi/Token/TokenCompatSubscriber.php
@@ -112,7 +112,8 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
$isHtml = ($e->message['format'] == 'text/html');
$useSmarty = !empty($e->context['smarty']);
- $e->string = \CRM_Utils_Token::replaceDomainTokens($e->string, \CRM_Core_BAO_Domain::getDomain(), $isHtml, $e->message['tokens'], $useSmarty);
+ $domain = \CRM_Core_BAO_Domain::getDomain();
+ $e->string = \CRM_Utils_Token::replaceDomainTokens($e->string, $domain, $isHtml, $e->message['tokens'], $useSmarty);
if (!empty($e->context['contact'])) {
$e->string = \CRM_Utils_Token::replaceContactTokens($e->string, $e->context['contact'], $isHtml, $e->message['tokens'], TRUE, $useSmarty);
diff --git a/civicrm/ang/crmMailing/EditRecipCtrl.js b/civicrm/ang/crmMailing/EditRecipCtrl.js
index 607ab2cb99..16c125f8cf 100644
--- a/civicrm/ang/crmMailing/EditRecipCtrl.js
+++ b/civicrm/ang/crmMailing/EditRecipCtrl.js
@@ -46,6 +46,8 @@
});
}, RECIPIENTS_DEBOUNCE_MS);
$scope.$watchCollection("mailing.dedupe_email", refreshRecipients);
+ $scope.$watchCollection("mailing.location_type_id", refreshRecipients);
+ $scope.$watchCollection("mailing.email_selection_method", refreshRecipients);
$scope.$watchCollection("mailing.recipients.groups.include", refreshRecipients);
$scope.$watchCollection("mailing.recipients.groups.exclude", refreshRecipients);
$scope.$watchCollection("mailing.recipients.mailings.include", refreshRecipients);
diff --git a/civicrm/ang/crmMailing/EditRecipOptionsDialogCtrl.html b/civicrm/ang/crmMailing/EditRecipOptionsDialogCtrl.html
index 53d2c15b88..4c773b4964 100644
--- a/civicrm/ang/crmMailing/EditRecipOptionsDialogCtrl.html
+++ b/civicrm/ang/crmMailing/EditRecipOptionsDialogCtrl.html
@@ -17,9 +17,7 @@
crm-ui-select="{dropdownAutoWidth : true}"
name="location_type_id"
ng-model="model.mailing.location_type_id"
- required
>
-
<option value="">{{ts('Automatic')}}</option>
<option ng-repeat="locType in model.fields.location_type_id.options"
ng-value="locType.key">{{locType.value}}</option>
@@ -32,7 +30,6 @@
crm-ui-select=""
name="email_selection_method"
ng-model="model.mailing.email_selection_method"
- required
>
<option ng-repeat="selMet in model.fields.email_selection_method.options"
ng-value="selMet.key">{{selMet.value}}</option>
diff --git a/civicrm/ang/crmMailingAB/BlockSetup.html b/civicrm/ang/crmMailingAB/BlockSetup.html
index da9b4568ef..7d124cc06c 100644
--- a/civicrm/ang/crmMailingAB/BlockSetup.html
+++ b/civicrm/ang/crmMailingAB/BlockSetup.html
@@ -4,7 +4,7 @@
{{ts('A/B testing allows you to send two test mailings to a random subset of your recipients. After collecting and comparing metrics, the more successful mailing will be sent to the remaining recipients.')}}
</div>
<div crm-ui-field="{name: 'setupForm.abName', title: ts('Name'), help: hs('name')}" ng-if="fields.abName">
- <input
+ <input type="text"
crm-ui-id="setupForm.abName"
name="abName"
ng-model="abtest.ab.name"
diff --git a/civicrm/api/v3/Activity.php b/civicrm/api/v3/Activity.php
index ba87a024a0..5815edc9e4 100644
--- a/civicrm/api/v3/Activity.php
+++ b/civicrm/api/v3/Activity.php
@@ -315,20 +315,16 @@ function civicrm_api3_activity_get($params) {
}
$sql = CRM_Utils_SQL_Select::fragment();
- // Support search by activity_contact
- $extraFieldSpecs = array();
- _civicrm_api3_activity_create_spec($extraFieldSpecs);
- $options = civicrm_api3('ActivityContact', 'getoptions', array('field' => 'record_type_id'));
- $options = $options['values'];
+ $recordTypes = civicrm_api3('ActivityContact', 'getoptions', array('field' => 'record_type_id'));
+ $recordTypes = $recordTypes['values'];
$activityContactOptions = array(
'contact_id' => NULL,
- 'target_contact_id' => array_search('Activity Targets', $options),
- 'source_contact_id' => array_search('Activity Source', $options),
- 'assignee_contact_id' => array_search('Activity Assignees', $options),
+ 'target_contact_id' => array_search('Activity Targets', $recordTypes),
+ 'source_contact_id' => array_search('Activity Source', $recordTypes),
+ 'assignee_contact_id' => array_search('Activity Assignees', $recordTypes),
);
foreach ($activityContactOptions as $activityContactName => $activityContactValue) {
if (!empty($params[$activityContactName])) {
- _civicrm_api3_validate_integer($params, $activityContactName, $extraFieldSpecs[$activityContactName], 'Activity');
if (!is_array($params[$activityContactName])) {
$params[$activityContactName] = array('=' => $params[$activityContactName]);
}
@@ -340,7 +336,6 @@ function civicrm_api3_activity_get($params) {
}
}
if (!empty($params['tag_id'])) {
- _civicrm_api3_validate_integer($params, 'tag_id', $extraFieldSpecs['tag_id'], 'Activity');
if (!is_array($params['tag_id'])) {
$params['tag_id'] = array('=' => $params['tag_id']);
}
@@ -350,7 +345,6 @@ function civicrm_api3_activity_get($params) {
}
}
if (!empty($params['file_id'])) {
- _civicrm_api3_validate_integer($params, 'file_id', $extraFieldSpecs['file_id'], 'Activity');
if (!is_array($params['file_id'])) {
$params['file_id'] = array('=' => $params['file_id']);
}
@@ -360,7 +354,6 @@ function civicrm_api3_activity_get($params) {
}
}
if (!empty($params['case_id'])) {
- _civicrm_api3_validate_integer($params, 'case_id', $extraFieldSpecs['case_id'], 'Activity');
if (!is_array($params['case_id'])) {
$params['case_id'] = array('=' => $params['case_id']);
}
@@ -375,7 +368,7 @@ function civicrm_api3_activity_get($params) {
return civicrm_api3_create_success($activities, $params, 'Activity', 'get');
}
- $activities = _civicrm_api3_activity_get_formatResult($params, $activities);
+ $activities = _civicrm_api3_activity_get_formatResult($params, $activities, $options);
//legacy custom data get - so previous formatted response is still returned too
return civicrm_api3_create_success($activities, $params, 'Activity', 'get');
}
@@ -392,18 +385,12 @@ function civicrm_api3_activity_get($params) {
* @return array
* new activities list
*/
-function _civicrm_api3_activity_get_formatResult($params, $activities) {
+function _civicrm_api3_activity_get_formatResult($params, $activities, $options) {
if (!$activities) {
return $activities;
}
- $returns = CRM_Utils_Array::value('return', $params, array());
- if (!is_array($returns)) {
- $returns = str_replace(' ', '', $returns);
- $returns = explode(',', $returns);
- }
- $returns = array_fill_keys($returns, 1);
-
+ $returns = $options['return'];
foreach ($params as $n => $v) {
if (substr($n, 0, 7) == 'return.') {
$returnkey = substr($n, 7);
@@ -482,6 +469,14 @@ function _civicrm_api3_activity_get_formatResult($params, $activities) {
}
break;
+ case 'case_id':
+ $dao = CRM_Core_DAO::executeQuery("SELECT activity_id, case_id FROM civicrm_case_activity WHERE activity_id IN (%1)",
+ array(1 => array(implode(',', array_keys($activities)), 'String', CRM_Core_DAO::QUERY_FORMAT_NO_QUOTES)));
+ while ($dao->fetch()) {
+ $activities[$dao->activity_id]['case_id'] = $dao->case_id;
+ }
+ break;
+
default:
if (substr($n, 0, 6) == 'custom') {
$returnProperties[$n] = $v;
diff --git a/civicrm/api/v3/Case.php b/civicrm/api/v3/Case.php
index efddd0904b..510b7d6750 100644
--- a/civicrm/api/v3/Case.php
+++ b/civicrm/api/v3/Case.php
@@ -146,6 +146,14 @@ function _civicrm_api3_case_get_spec(&$params) {
'description' => 'Id of an activity in the case',
'type' => CRM_Utils_Type::T_INT,
);
+ $params['tag_id'] = array(
+ 'title' => 'Tags',
+ 'description' => 'Find activities with specified tags.',
+ 'type' => 1,
+ 'FKClassName' => 'CRM_Core_DAO_Tag',
+ 'FKApiName' => 'Tag',
+ 'supports_joins' => TRUE,
+ );
}
/**
@@ -218,16 +226,18 @@ function civicrm_api3_case_get($params) {
// Add clause to search by client
if (!empty($params['contact_id'])) {
- $contacts = array();
- foreach ((array) $params['contact_id'] as $c) {
- if (!CRM_Utils_Rule::positiveInteger($c)) {
- throw new API_Exception('Invalid parameter: contact_id. Must provide numeric value(s).');
+ // Legacy support - this field historically supports a nonstandard format of array(1,2,3) as a synonym for array('IN' => array(1,2,3))
+ if (is_array($params['contact_id'])) {
+ $operator = CRM_Utils_Array::first(array_keys($params['contact_id']));
+ if (!in_array($operator, \CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
+ $params['contact_id'] = array('IN' => $params['contact_id']);
}
- $contacts[] = $c;
}
- $sql
- ->join('civicrm_case_contact', 'INNER JOIN civicrm_case_contact ON civicrm_case_contact.case_id = a.id')
- ->where('civicrm_case_contact.contact_id IN (' . implode(',', $contacts) . ')');
+ else {
+ $params['contact_id'] = array('=' => $params['contact_id']);
+ }
+ $clause = CRM_Core_DAO::createSQLFilter('contact_id', $params['contact_id']);
+ $sql->where("a.id IN (SELECT case_id FROM civicrm_case_contact WHERE $clause)");
}
// Add clause to search by activity
@@ -245,9 +255,22 @@ function civicrm_api3_case_get($params) {
->where("civicrm_case_activity.activity_id IN ($activityId)");
}
- $foundcases = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, TRUE, 'Case', $sql);
+ // Clause to search by tag
+ if (!empty($params['tag_id'])) {
+ $dummySpec = array();
+ _civicrm_api3_validate_integer($params, 'tag_id', $dummySpec, 'Case');
+ if (!is_array($params['tag_id'])) {
+ $params['tag_id'] = array('=' => $params['tag_id']);
+ }
+ $clause = \CRM_Core_DAO::createSQLFilter('tag_id', $params['tag_id']);
+ if ($clause) {
+ $sql->where('a.id IN (SELECT entity_id FROM civicrm_entity_tag WHERE entity_table = "civicrm_case" AND !clause)', array('!clause' => $clause));
+ }
+ }
+
+ $cases = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), array('sequential' => 0) + $params, TRUE, 'Case', $sql);
- if (empty($options['is_count'])) {
+ if (empty($options['is_count']) && !empty($cases['values'])) {
// For historic reasons we return these by default only when fetching a case by id
if (!empty($params['id']) && empty($options['return'])) {
$options['return'] = array(
@@ -257,12 +280,15 @@ function civicrm_api3_case_get($params) {
);
}
- foreach ($foundcases['values'] as &$case) {
- _civicrm_api3_case_read($case, $options);
+ _civicrm_api3_case_read($cases['values'], $options);
+
+ // We disabled sequential to keep the list indexed for case_read(). Now add it back.
+ if (!empty($params['sequential'])) {
+ $cases['values'] = array_values($cases['values']);
}
}
- return $foundcases;
+ return $cases;
}
/**
@@ -392,29 +418,71 @@ function civicrm_api3_case_delete($params) {
}
/**
- * Augment a case with extra data.
+ * Augment case results with extra data.
*
- * @param array $case
+ * @param array $cases
* @param array $options
*/
-function _civicrm_api3_case_read(&$case, $options) {
- if (empty($options['return']) || !empty($options['return']['contact_id'])) {
- // Legacy support for client_id - TODO: in apiv4 remove 'client_id'
- $case['client_id'] = $case['contact_id'] = CRM_Case_BAO_Case::retrieveContactIdsByCaseId($case['id']);
- }
- if (!empty($options['return']['contacts'])) {
- //get case contacts
- $contacts = CRM_Case_BAO_Case::getcontactNames($case['id']);
- $relations = CRM_Case_BAO_Case::getRelatedContacts($case['id']);
- $case['contacts'] = array_merge($contacts, $relations);
+function _civicrm_api3_case_read(&$cases, $options) {
+ foreach ($cases as &$case) {
+ if (empty($options['return']) || !empty($options['return']['contact_id'])) {
+ // Legacy support for client_id - TODO: in apiv4 remove 'client_id'
+ $case['client_id'] = $case['contact_id'] = CRM_Case_BAO_Case::retrieveContactIdsByCaseId($case['id']);
+ }
+ if (!empty($options['return']['contacts'])) {
+ //get case contacts
+ $contacts = CRM_Case_BAO_Case::getcontactNames($case['id']);
+ $relations = CRM_Case_BAO_Case::getRelatedContacts($case['id']);
+ $case['contacts'] = array_unique(array_merge($contacts, $relations), SORT_REGULAR);
+ }
+ if (!empty($options['return']['activities'])) {
+ // add case activities array - we'll populate them in bulk below
+ $case['activities'] = array();
+ }
+ // Properly render this joined field
+ if (!empty($options['return']['case_type_id.definition'])) {
+ if (!empty($case['case_type_id.definition'])) {
+ list($xml) = CRM_Utils_XML::parseString($case['case_type_id.definition']);
+ }
+ else {
+ $caseTypeId = !empty($case['case_type_id']) ? $case['case_type_id'] : CRM_Core_DAO::getFieldValue('CRM_Case_DAO_Case', $case['id'], 'case_type_id');
+ $caseTypeName = !empty($case['case_type_id.name']) ? $case['case_type_id.name'] : CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseType', $caseTypeId, 'name');
+ $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseTypeName);
+ }
+ $case['case_type_id.definition'] = array();
+ if ($xml) {
+ $case['case_type_id.definition'] = CRM_Case_BAO_CaseType::convertXmlToDefinition($xml);
+ }
+ }
}
+ // Bulk-load activities
if (!empty($options['return']['activities'])) {
- //get case activities
- $case['activities'] = array();
- $query = "SELECT activity_id FROM civicrm_case_activity WHERE case_id = %1";
- $dao = CRM_Core_DAO::executeQuery($query, array(1 => array($case['id'], 'Integer')));
+ $query = "SELECT case_id, activity_id FROM civicrm_case_activity WHERE case_id IN (%1)";
+ $params = array(1 => array(implode(',', array_keys($cases)), 'String', CRM_Core_DAO::QUERY_FORMAT_NO_QUOTES));
+ $dao = CRM_Core_DAO::executeQuery($query, $params);
while ($dao->fetch()) {
- $case['activities'][] = $dao->activity_id;
+ $cases[$dao->case_id]['activities'][] = $dao->activity_id;
+ }
+ }
+ // Bulk-load tags. Supports joins onto the tag entity.
+ $tagGet = array('tag_id', 'entity_id');
+ foreach (array_keys($options['return']) as $key) {
+ if (strpos($key, 'tag_id.') === 0) {
+ $tagGet[] = $key;
+ $options['return']['tag_id'] = 1;
+ }
+ }
+ if (!empty($options['return']['tag_id'])) {
+ $tags = civicrm_api3('EntityTag', 'get', array(
+ 'entity_table' => 'civicrm_case',
+ 'entity_id' => array('IN' => array_keys($cases)),
+ 'return' => $tagGet,
+ 'options' => array('limit' => 0),
+ ));
+ foreach ($tags['values'] as $tag) {
+ $key = (int) $tag['entity_id'];
+ unset($tag['entity_id'], $tag['id']);
+ $cases[$key]['tag_id'][$tag['tag_id']] = $tag;
}
}
}
diff --git a/civicrm/api/v3/CaseType.php b/civicrm/api/v3/CaseType.php
index 67aaf9585e..36b011e325 100644
--- a/civicrm/api/v3/CaseType.php
+++ b/civicrm/api/v3/CaseType.php
@@ -51,7 +51,7 @@ function civicrm_api3_case_type_create($params) {
$params['is_active'] = TRUE;
}
// This is an existing case-type.
- if (!empty($params['id'])
+ if (!empty($params['id']) && isset($params['definition'])
&& !CRM_Case_BAO_CaseType::isForked($params['id']) // which is not yet forked
&& !CRM_Case_BAO_CaseType::isForkable($params['id']) // for which new forks are prohibited
) {
@@ -75,29 +75,34 @@ function civicrm_api3_case_type_get($params) {
}
$caseTypes = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
// format case type, to fetch xml definition
- return _civicrm_api3_case_type_get_formatResult($caseTypes);
+ $options = _civicrm_api3_get_options_from_params($params);
+ return _civicrm_api3_case_type_get_formatResult($caseTypes, $options);
}
/**
* Format definition.
*
* @param array $result
+ * @param array $options
*
* @return array
* @throws \CRM_Core_Exception
*/
-function _civicrm_api3_case_type_get_formatResult(&$result) {
- foreach ($result['values'] as $key => $caseType) {
- $caseTypeName = (isset($caseType['name'])) ? $caseType['name'] : CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseType', $caseType['id'], 'name', 'id', TRUE);
- $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseTypeName);
- if ($xml) {
- $result['values'][$key]['definition'] = CRM_Case_BAO_CaseType::convertXmlToDefinition($xml);
+function _civicrm_api3_case_type_get_formatResult(&$result, $options = array()) {
+ foreach ($result['values'] as $key => &$caseType) {
+ if (!empty($caseType['definition'])) {
+ list($xml) = CRM_Utils_XML::parseString($caseType['definition']);
+ $caseType['definition'] = $xml ? CRM_Case_BAO_CaseType::convertXmlToDefinition($xml) : array();
}
else {
- $result['values'][$key]['definition'] = array();
+ if (empty($options['return']) || !empty($options['return']['definition'])) {
+ $caseTypeName = (isset($caseType['name'])) ? $caseType['name'] : CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseType', $caseType['id'], 'name', 'id', TRUE);
+ $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseTypeName);
+ $caseType['definition'] = $xml ? CRM_Case_BAO_CaseType::convertXmlToDefinition($xml) : array();
+ }
}
- $result['values'][$key]['is_forkable'] = CRM_Case_BAO_CaseType::isForkable($result['values'][$key]['id']);
- $result['values'][$key]['is_forked'] = CRM_Case_BAO_CaseType::isForked($result['values'][$key]['id']);
+ $caseType['is_forkable'] = CRM_Case_BAO_CaseType::isForkable($caseType['id']);
+ $caseType['is_forked'] = CRM_Case_BAO_CaseType::isForked($caseType['id']);
}
return $result;
}
diff --git a/civicrm/api/v3/Contribution.php b/civicrm/api/v3/Contribution.php
index c6e2b1e7ab..2fa6ba7205 100644
--- a/civicrm/api/v3/Contribution.php
+++ b/civicrm/api/v3/Contribution.php
@@ -443,6 +443,7 @@ function civicrm_api3_contribution_sendconfirmation($params) {
'payment_processor_id',
);
$input = array_intersect_key($params, array_flip($allowedParams));
+ $input['is_email_receipt'] = TRUE;
CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $params['id'], $values);
}
diff --git a/civicrm/api/v3/Generic.php b/civicrm/api/v3/Generic.php
index c4bb0c3417..b6d0bb1cac 100644
--- a/civicrm/api/v3/Generic.php
+++ b/civicrm/api/v3/Generic.php
@@ -172,6 +172,9 @@ function civicrm_api3_generic_getfields($apiRequest, $unique = TRUE) {
// find any supplemental information
$hypApiRequest = array('entity' => $apiRequest['entity'], 'action' => $action, 'version' => $apiRequest['version']);
+ if ($action == 'getsingle') {
+ $hypApiRequest['action'] = 'get';
+ }
try {
list ($apiProvider, $hypApiRequest) = \Civi::service('civi_api_kernel')->resolve($hypApiRequest);
if (isset($hypApiRequest['function'])) {
diff --git a/civicrm/api/v3/Job.php b/civicrm/api/v3/Job.php
index 89f4fb0d3b..8cd1b2af27 100644
--- a/civicrm/api/v3/Job.php
+++ b/civicrm/api/v3/Job.php
@@ -358,15 +358,23 @@ function civicrm_api3_job_fetch_bounces($params) {
if (!$lock->isAcquired()) {
return civicrm_api3_create_error('Could not acquire lock, another EmailProcessor process is running');
}
- if (!CRM_Utils_Mail_EmailProcessor::processBounces()) {
- $lock->release();
- return civicrm_api3_create_error('Process Bounces failed');
- }
+ CRM_Utils_Mail_EmailProcessor::processBounces($params['is_create_activities']);
$lock->release();
- // FIXME: processBounces doesn't return true/false on success/failure
- $values = array();
- return civicrm_api3_create_success($values, $params, 'Job', 'fetch_bounces');
+ return civicrm_api3_create_success(1, $params, 'Job', 'fetch_bounces');
+}
+
+/**
+ * Metadata for bounce function.
+ *
+ * @param array $params
+ */
+function _civicrm_api3_job_fetch_bounces_spec(&$params) {
+ $params['is_create_activities'] = array(
+ 'api.default' => 0,
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ 'title' => ts('Create activities for replies?'),
+ );
}
/**
diff --git a/civicrm/api/v3/Order.php b/civicrm/api/v3/Order.php
index c0dc2985fb..4bbaef684f 100644
--- a/civicrm/api/v3/Order.php
+++ b/civicrm/api/v3/Order.php
@@ -26,7 +26,8 @@
*/
/**
- * This api exposes CiviCRM Order records.
+ * This api exposes CiviCRM Order objects, an abstract entity
+ * comprised of contributions and related line items.
*
* @package CiviCRM_APIv3
*/
diff --git a/civicrm/api/v3/examples/Contact/APIChainedArray.php b/civicrm/api/v3/examples/Contact/APIChainedArray.php
index 35f3a002d4..22ac36b2bc 100644
--- a/civicrm/api/v3/examples/Contact/APIChainedArray.php
+++ b/civicrm/api/v3/examples/Contact/APIChainedArray.php
@@ -111,6 +111,7 @@ function contact_get_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => 'English (United States)',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
@@ -146,6 +147,8 @@ function contact_get_expectedresult() {
'display_name' => 'abc3 xyz3',
'contribution_id' => '2',
'currency' => 'USD',
+ 'payment_instrument' => 'Credit Card',
+ 'payment_instrument_id' => '1',
'receive_date' => '2011-01-01 00:00:00',
'non_deductible_amount' => '10.00',
'total_amount' => '120.00',
@@ -162,6 +165,7 @@ function contact_get_expectedresult() {
'contribution_recur_id' => '',
'is_test' => 0,
'is_pay_later' => 0,
+ 'contribution_status' => 'Completed',
'contribution_status_id' => '1',
'contribution_check_number' => '',
'contribution_campaign_id' => '',
@@ -181,11 +185,8 @@ function contact_get_expectedresult() {
'contribution_campaign_title' => '',
'contribution_note' => '',
'contribution_batch' => '',
- 'contribution_status' => 'Completed',
- 'payment_instrument' => 'Credit Card',
- 'payment_instrument_id' => '1',
- 'instrument_id' => '1',
'check_number' => '',
+ 'instrument_id' => '1',
'id' => '2',
'contribution_type_id' => '1',
),
diff --git a/civicrm/api/v3/examples/Contact/APIChainedArrayFormats.php b/civicrm/api/v3/examples/Contact/APIChainedArrayFormats.php
index 5145682730..491dff540c 100644
--- a/civicrm/api/v3/examples/Contact/APIChainedArrayFormats.php
+++ b/civicrm/api/v3/examples/Contact/APIChainedArrayFormats.php
@@ -112,6 +112,7 @@ function contact_get_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => 'English (United States)',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
diff --git a/civicrm/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php b/civicrm/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
index d9d6b8f49e..5525cc34d0 100644
--- a/civicrm/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
+++ b/civicrm/api/v3/examples/Contact/APIChainedArrayMultipleCustom.php
@@ -109,6 +109,7 @@ function contact_get_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => 'English (United States)',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
diff --git a/civicrm/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.php b/civicrm/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.php
new file mode 100644
index 0000000000..f69947ecc4
--- /dev/null
+++ b/civicrm/api/v3/examples/Contact/ContactIDOfLoggedInUserContactAPI.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Test Generated example demonstrating the Contact.get API.
+ *
+ * Get contact id of the current logged in user
+ *
+ * @return array
+ * API result array
+ */
+function contact_get_example() {
+ $params = array(
+ 'id' => 'user_contact_id',
+ );
+
+ try{
+ $result = civicrm_api3('Contact', 'get', $params);
+ }
+ catch (CiviCRM_API3_Exception $e) {
+ // Handle error here.
+ $errorMessage = $e->getMessage();
+ $errorCode = $e->getErrorCode();
+ $errorData = $e->getExtraParams();
+ return array(
+ 'is_error' => 1,
+ 'error_message' => $errorMessage,
+ 'error_code' => $errorCode,
+ 'error_data' => $errorData,
+ );
+ }
+
+ return $result;
+}
+
+/**
+ * Function returns array of result expected from previous function.
+ *
+ * @return array
+ * API result array
+ */
+function contact_get_expectedresult() {
+
+ $expectedResult = array(
+ 'is_error' => 0,
+ 'version' => 3,
+ 'count' => 1,
+ 'id' => 3,
+ 'values' => array(
+ '3' => array(
+ 'contact_id' => '3',
+ 'contact_type' => 'Individual',
+ 'contact_sub_type' => '',
+ 'sort_name' => 'User 412074113, Logged In',
+ 'display_name' => 'Mr. Logged In User 412074113 II',
+ 'do_not_email' => 0,
+ 'do_not_phone' => 0,
+ 'do_not_mail' => 0,
+ 'do_not_sms' => 0,
+ 'do_not_trade' => 0,
+ 'is_opt_out' => 0,
+ 'legal_identifier' => '',
+ 'external_identifier' => '',
+ 'nick_name' => '',
+ 'legal_name' => '',
+ 'image_URL' => '',
+ 'preferred_communication_method' => '',
+ 'preferred_language' => 'en_US',
+ 'preferred_mail_format' => 'Both',
+ 'first_name' => 'Logged In',
+ 'middle_name' => 'J.',
+ 'last_name' => 'User 412074113',
+ 'prefix_id' => '3',
+ 'suffix_id' => '3',
+ 'formal_title' => '',
+ 'communication_style_id' => '',
+ 'job_title' => '',
+ 'gender_id' => '',
+ 'birth_date' => '',
+ 'is_deceased' => 0,
+ 'deceased_date' => '',
+ 'household_name' => '',
+ 'organization_name' => '',
+ 'sic_code' => '',
+ 'contact_is_deleted' => 0,
+ 'current_employer' => '',
+ 'address_id' => '',
+ 'street_address' => '',
+ 'supplemental_address_1' => '',
+ 'supplemental_address_2' => '',
+ 'city' => '',
+ 'postal_code_suffix' => '',
+ 'postal_code' => '',
+ 'geo_code_1' => '',
+ 'geo_code_2' => '',
+ 'state_province_id' => '',
+ 'country_id' => '',
+ 'phone_id' => '',
+ 'phone_type_id' => '',
+ 'phone' => '',
+ 'email_id' => '1',
+ 'email' => 'anthony_anderson@civicrm.org',
+ 'on_hold' => 0,
+ 'im_id' => '',
+ 'provider_id' => '',
+ 'im' => '',
+ 'worldregion_id' => '',
+ 'world_region' => '',
+ 'languages' => 'English (United States)',
+ 'individual_prefix' => 'Mr.',
+ 'individual_suffix' => 'II',
+ 'communication_style' => '',
+ 'gender' => '',
+ 'state_province_name' => '',
+ 'state_province' => '',
+ 'country' => '',
+ 'id' => '3',
+ ),
+ ),
+ );
+
+ return $expectedResult;
+}
+
+/*
+* This example has been generated from the API test suite.
+* The test that created it is called "testLoggedInUserAPISupportToken"
+* and can be found at:
+* https://github.com/civicrm/civicrm-core/blob/master/tests/phpunit/api/v3/ContactTest.php
+*
+* You can see the outcome of the API tests at
+* https://test.civicrm.org/job/CiviCRM-master-git/
+*
+* To Learn about the API read
+* http://wiki.civicrm.org/confluence/display/CRMDOC/Using+the+API
+*
+* Browse the api on your own site with the api explorer
+* http://MYSITE.ORG/path/to/civicrm/api
+*
+* Read more about testing here
+* http://wiki.civicrm.org/confluence/display/CRM/Testing
+*
+* API Standards documentation:
+* http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
+*/
diff --git a/civicrm/api/v3/examples/Contact/Get.php b/civicrm/api/v3/examples/Contact/Get.php
index 9f666711fc..04751ef5ef 100644
--- a/civicrm/api/v3/examples/Contact/Get.php
+++ b/civicrm/api/v3/examples/Contact/Get.php
@@ -102,6 +102,7 @@ function contact_get_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => 'English (United States)',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
diff --git a/civicrm/api/v3/examples/Contact/GetSingleContact.php b/civicrm/api/v3/examples/Contact/GetSingleContact.php
index 8df5d1e5af..94d4885b2b 100644
--- a/civicrm/api/v3/examples/Contact/GetSingleContact.php
+++ b/civicrm/api/v3/examples/Contact/GetSingleContact.php
@@ -100,6 +100,7 @@ function contact_getsingle_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => '',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
diff --git a/civicrm/api/v3/examples/Contact/GroupFilterUsingContactAPI.php b/civicrm/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
index 879b059fa5..7748fc46d9 100644
--- a/civicrm/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
+++ b/civicrm/api/v3/examples/Contact/GroupFilterUsingContactAPI.php
@@ -109,6 +109,7 @@ function contact_get_expectedresult() {
'im' => '',
'worldregion_id' => '',
'world_region' => '',
+ 'languages' => 'English (United States)',
'individual_prefix' => '',
'individual_suffix' => '',
'communication_style' => '',
diff --git a/civicrm/api/v3/examples/Setting/GetFields.php b/civicrm/api/v3/examples/Setting/GetFields.php
index 9e6170e70d..90ca0004bc 100644
--- a/civicrm/api/v3/examples/Setting/GetFields.php
+++ b/civicrm/api/v3/examples/Setting/GetFields.php
@@ -225,36 +225,6 @@ function setting_getfields_expectedresult() {
'description' => '',
'help_text' => '',
),
- 'financial_account_bal_enable' => array(
- 'group_name' => 'Contribute Preferences',
- 'group' => 'contribute',
- 'name' => 'financial_account_bal_enable',
- 'type' => 'Integer',
- 'html_type' => 'checkbox',
- 'quick_form_type' => 'Element',
- 'default' => 0,
- 'add' => '4.7',
- 'title' => 'Enable Financial Account Balances',
- 'is_domain' => 1,
- 'is_contact' => 0,
- 'description' => '',
- 'help_text' => '',
- ),
- 'prior_financial_period' => array(
- 'group_name' => 'Contribute Preferences',
- 'group' => 'contribute',
- 'name' => 'prior_financial_period',
- 'type' => 'activityDate',
- 'quick_form_type' => 'Date',
- 'html_type' => 'Date',
- 'default' => '',
- 'add' => '4.7',
- 'title' => 'Prior Financial Period',
- 'is_domain' => 1,
- 'is_contact' => 0,
- 'description' => '',
- 'help_text' => '',
- ),
'always_post_to_accounts_receivable' => array(
'group_name' => 'Contribute Preferences',
'group' => 'contribute',
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 9b670cabc5..a205872cd2 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
function civicrmVersion( ) {
- return array( 'version' => '4.7.17',
+ return array( 'version' => '4.7.18',
'cms' => 'Wordpress',
- 'revision' => 'e0ebb075af' );
+ 'revision' => '9923687b45' );
}
diff --git a/civicrm/composer.lock b/civicrm/composer.lock
index d24253a1ef..e2378071a1 100644
--- a/civicrm/composer.lock
+++ b/civicrm/composer.lock
@@ -4,7 +4,6 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "94c7ae299e411a3b9013da64e1232669",
"content-hash": "36ffd76fc5e7344ac6e587d11779ceeb",
"packages": [
{
@@ -45,7 +44,7 @@
}
],
"description": "RPC library for CiviConnect",
- "time": "2016-12-06 04:32:51"
+ "time": "2016-12-06T04:32:51+00:00"
},
{
"name": "dompdf/dompdf",
@@ -106,7 +105,7 @@
],
"description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
"homepage": "https://github.com/dompdf/dompdf",
- "time": "2016-05-11 00:36:29"
+ "time": "2016-05-11T00:36:29+00:00"
},
{
"name": "pclzip/pclzip",
@@ -143,7 +142,7 @@
"php",
"zip"
],
- "time": "2014-06-05 11:42:24"
+ "time": "2014-06-05T11:42:24+00:00"
},
{
"name": "pear/pear_exception",
@@ -198,7 +197,7 @@
"keywords": [
"exception"
],
- "time": "2015-02-10 20:07:52"
+ "time": "2015-02-10T20:07:52+00:00"
},
{
"name": "pear/validate_finance_creditcard",
@@ -276,7 +275,7 @@
],
"description": "A library to read, parse, export and make subsets of different types of font files.",
"homepage": "https://github.com/PhenX/php-font-lib",
- "time": "2015-05-06 20:02:39"
+ "time": "2015-05-06T20:02:39+00:00"
},
{
"name": "phenx/php-svg-lib",
@@ -310,7 +309,7 @@
],
"description": "A library to read, parse and export to PDF SVG files.",
"homepage": "https://github.com/PhenX/php-svg-lib",
- "time": "2015-05-06 18:49:49"
+ "time": "2015-05-06T18:49:49+00:00"
},
{
"name": "phpoffice/common",
@@ -365,7 +364,7 @@
"office",
"php"
],
- "time": "2016-07-07 17:26:55"
+ "time": "2016-07-07T17:26:55+00:00"
},
{
"name": "phpoffice/phpword",
@@ -465,7 +464,7 @@
"word",
"writer"
],
- "time": "2016-07-31 08:53:39"
+ "time": "2016-07-31T08:53:39+00:00"
},
{
"name": "phpseclib/phpseclib",
@@ -564,7 +563,7 @@
"x.509",
"x509"
],
- "time": "2016-10-22 17:53:16"
+ "time": "2016-10-22T17:53:16+00:00"
},
{
"name": "psr/log",
@@ -602,7 +601,7 @@
"psr",
"psr-3"
],
- "time": "2012-12-21 11:40:51"
+ "time": "2012-12-21T11:40:51+00:00"
},
{
"name": "symfony/config",
@@ -650,7 +649,7 @@
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
- "time": "2015-01-03 08:01:13"
+ "time": "2015-01-03T08:01:13+00:00"
},
{
"name": "symfony/dependency-injection",
@@ -707,7 +706,7 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
- "time": "2015-01-25 04:37:39"
+ "time": "2015-01-25T04:37:39+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -764,7 +763,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2015-01-29 18:20:43"
+ "time": "2015-01-29T18:20:43+00:00"
},
{
"name": "symfony/filesystem",
@@ -811,7 +810,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
- "time": "2015-01-03 21:04:44"
+ "time": "2015-01-03T21:04:44+00:00"
},
{
"name": "symfony/finder",
@@ -858,7 +857,7 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
- "time": "2015-01-03 08:01:13"
+ "time": "2015-01-03T08:01:13+00:00"
},
{
"name": "symfony/process",
@@ -905,7 +904,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2015-02-08 07:07:45"
+ "time": "2015-02-08T07:07:45+00:00"
},
{
"name": "tecnickcom/tcpdf",
@@ -968,7 +967,7 @@
"pdf417",
"qrcode"
],
- "time": "2015-09-12 10:08:34"
+ "time": "2015-09-12T10:08:34+00:00"
},
{
"name": "totten/ca-config",
@@ -1005,7 +1004,7 @@
],
"description": "Default configuration for certificate authorities",
"homepage": "https://github.com/totten/ca_config",
- "time": "2013-02-13 03:40:18"
+ "time": "2013-02-13T03:40:18+00:00"
},
{
"name": "zendframework/zend-escaper",
@@ -1050,7 +1049,7 @@
"escaper",
"zf2"
],
- "time": "2015-05-07 14:55:31"
+ "time": "2015-05-07T14:55:31+00:00"
},
{
"name": "zendframework/zend-stdlib",
@@ -1105,7 +1104,7 @@
"stdlib",
"zf2"
],
- "time": "2015-07-21 13:55:46"
+ "time": "2015-07-21T13:55:46+00:00"
},
{
"name": "zendframework/zend-validator",
@@ -1170,7 +1169,7 @@
"validator",
"zf2"
],
- "time": "2015-09-08 21:04:17"
+ "time": "2015-09-08T21:04:17+00:00"
},
{
"name": "zetacomponents/base",
@@ -1230,7 +1229,7 @@
],
"description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
"homepage": "https://github.com/zetacomponents",
- "time": "2009-06-29 10:47:39"
+ "time": "2009-06-29T10:47:39+00:00"
},
{
"name": "zetacomponents/mail",
@@ -1238,7 +1237,7 @@
"source": {
"type": "git",
"url": "https://github.com/civicrm/zetacomponents-mail.git",
- "reference": "19f5af66cdde19bc20f41671fe453b37f4121eb1"
+ "reference": "e0feff0e1860f16fa2b3c42795c0351db58120a0"
},
"type": "library",
"autoload": {
@@ -1292,7 +1291,7 @@
],
"description": "The component allows you construct and/or parse Mail messages conforming to the mail standard. It has support for attachments, multipart messages and HTML mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to retrieve e-mail.",
"homepage": "https://github.com/zetacomponents",
- "time": "2016-01-08 01:15:38"
+ "time": "2017-03-14 06:51:24"
}
],
"packages-dev": [],
diff --git a/civicrm/css/civicrmNavigation.css b/civicrm/css/civicrmNavigation.css
index 3458bc3081..18bc29f25c 100644
--- a/civicrm/css/civicrmNavigation.css
+++ b/civicrm/css/civicrmNavigation.css
@@ -127,7 +127,8 @@ li.menu-separator{
line-height: 0; /* for ie */
margin: 2px 0;
}
-#civicrm-menu .crm-logo-sm {
+#civicrm-menu .crm-logo-sm,
+.crm-container .crm-logo-sm {
background: url('../i/item_sprites.png') no-repeat scroll -80px -16px;
display: inline-block;
width: 16px;
diff --git a/civicrm/css/contactSummary.css b/civicrm/css/contactSummary.css
index 6a957989da..c29270bac9 100644
--- a/civicrm/css/contactSummary.css
+++ b/civicrm/css/contactSummary.css
@@ -349,14 +349,7 @@ div#crm-contact-thumbnail {
max-height: 500px;
overflow: auto;
}
-#tagtree,
-#tagtree li.highlighted ul {
- background-color: white;
-}
-#tagtree li.highlighted,
-#tagtree li.highlighted-child.jstree-closed {
- background-color: #fefcb0;
-}
+
#tagtree li {
margin-top: 5px;
}
@@ -365,8 +358,11 @@ div#crm-contact-thumbnail {
position: relative;
top: -3px;
}
-#tagtree input {
- margin: 0;
+#tagtree .jstree-disabled {
+ cursor: not-allowed;
+}
+#tagtree .jstree-disabled > .jstree-checkbox {
+ opacity: .2;
}
#tagGroup table .label {
diff --git a/civicrm/css/print.css b/civicrm/css/print.css
index 0eb326d7fe..99e8fab6fb 100644
--- a/civicrm/css/print.css
+++ b/civicrm/css/print.css
@@ -124,3 +124,8 @@ table.form-layout td, table.form-layout th {
font-style : italic;
float : right;
}
+
+/* Fix for CRM-19869 */
+tr {
+ page-break-inside: avoid;
+}
diff --git a/civicrm/install/civicrm.php b/civicrm/install/civicrm.php
index c724722714..50e4271081 100644
--- a/civicrm/install/civicrm.php
+++ b/civicrm/install/civicrm.php
@@ -97,8 +97,13 @@ function civicrm_main(&$config) {
civicrm_setup($files_dirname);
}
- $dsn = "mysql://{$config['mysql']['username']}:{$config['mysql']['password']}@{$config['mysql']['server']}/{$config['mysql']['database']}?new_link=true";
+ $parts = explode(':', $config['mysql']['server']);
+ if (empty($parts[1])) {
+ $parts[1] = 3306;
+ }
+ $config['mysql']['server'] = implode(':', $parts);
+ $dsn = "mysql://{$config['mysql']['username']}:{$config['mysql']['password']}@{$config['mysql']['server']}/{$config['mysql']['database']}?new_link=true";
civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm.mysql');
if (!empty($config['loadGenerated'])) {
@@ -224,7 +229,14 @@ function civicrm_config(&$config) {
$params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base();
if ($installType == 'drupal' && defined('VERSION')) {
- if (version_compare(VERSION, '7.0-rc1') >= 0) {
+ if (version_compare(VERSION, '8.0') >= 0) {
+ $params['cms'] = 'Drupal';
+ $params['CMSdbUser'] = addslashes($config['drupal']['username']);
+ $params['CMSdbPass'] = addslashes($config['drupal']['password']);
+ $params['CMSdbHost'] = $config['drupal']['host'] . ":" . !empty($config['drupal']['port']) ? $config['drupal']['port'] : "3306";
+ $params['CMSdbName'] = addslashes($config['drupal']['database']);
+ }
+ elseif (version_compare(VERSION, '7.0-rc1') >= 0) {
$params['cms'] = 'Drupal';
$params['CMSdbUser'] = addslashes($config['drupal']['username']);
$params['CMSdbPass'] = addslashes($config['drupal']['password']);
diff --git a/civicrm/js/Common.js b/civicrm/js/Common.js
index 4600589652..df3ddb5fae 100644
--- a/civicrm/js/Common.js
+++ b/civicrm/js/Common.js
@@ -243,8 +243,16 @@ if (!CRM.vars) CRM.vars = {};
var script = document.createElement('script');
scriptsLoaded[url] = $.Deferred();
script.onload = function () {
+ if (window.jQuery === CRM.$ && CRM.CMSjQuery) {
+ window.jQuery = CRM.CMSjQuery;
+ }
scriptsLoaded[url].resolve();
};
+ // Make jQuery global available while script is loading
+ if (window.jQuery !== CRM.$) {
+ CRM.CMSjQuery = window.jQuery;
+ window.jQuery = CRM.$;
+ }
script.src = url;
document.getElementsByTagName("head")[0].appendChild(script);
}
@@ -765,58 +773,6 @@ if (!CRM.vars) CRM.vars = {};
});
};
- $.fn.crmAjaxTable = function() {
- // Strip the ids from ajax urls to make pageLength storage more generic
- function simplifyUrl(ajax) {
- // Datatables ajax prop could be a url string or an object containing the url
- var url = typeof ajax === 'object' ? ajax.url : ajax;
- return typeof url === 'string' ? url.replace(/[&?]\w*id=\d+/g, '') : null;
- }
-
- return $(this).each(function() {
- // Recall pageLength for this table
- var url = simplifyUrl($(this).data('ajax'));
- if (url && window.localStorage && localStorage['dataTablePageLength:' + url]) {
- $(this).data('pageLength', localStorage['dataTablePageLength:' + url]);
- }
- // Declare the defaults for DataTables
- var defaults = {
- "processing": true,
- "serverSide": true,
- "order": [],
- "dom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
- "pageLength": 25,
- "pagingType": "full_numbers",
- "drawCallback": function(settings) {
- //Add data attributes to cells
- $('thead th', settings.nTable).each( function( index ) {
- $.each(this.attributes, function() {
- if(this.name.match("^cell-")) {
- var cellAttr = this.name.substring(5);
- var cellValue = this.value;
- $('tbody tr', settings.nTable).each( function() {
- $('td:eq('+ index +')', this).attr( cellAttr, cellValue );
- });
- }
- });
- });
- //Reload table after draw
- $(settings.nTable).trigger('crmLoad');
- }
- };
- //Include any table specific data
- var settings = $.extend(true, defaults, $(this).data('table'));
- // Remember pageLength
- $(this).on('length.dt', function(e, settings, len) {
- if (settings.ajax && window.localStorage) {
- localStorage['dataTablePageLength:' + simplifyUrl(settings.ajax)] = len;
- }
- });
- //Make the DataTables call
- $(this).DataTable(settings);
- });
- };
-
CRM.utils.formatSelect2Result = function (row) {
var markup = '<div class="crm-select2-row">';
if (row.image !== undefined) {
@@ -1037,14 +993,19 @@ 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() {
- $table.crmAjaxTable();
+ CRM.loadScript(script).done(function() {
+ $table.crmAjaxTable();
+ });
});
} else {
- $table.crmAjaxTable();
+ CRM.loadScript(script).done(function() {
+ $table.crmAjaxTable();
+ });
}
});
if ($("input:radio[name=radio_ts]").size() == 1) {
@@ -1056,6 +1017,12 @@ if (!CRM.vars) CRM.vars = {};
$('.crm-form-text[data-crm-datepicker]', e.target).each(function() {
$(this).crmDatepicker($(this).data('crmDatepicker'));
});
+ $('.crm-editable', e.target).not('thead *').each(function() {
+ var $el = $(this);
+ CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmEditable.js').done(function() {
+ $el.crmEditable();
+ });
+ });
// Cache Form Input initial values
$('form[data-warn-changes] :input', e.target).each(function() {
$(this).data('crm-initial-value', $(this).is(':checkbox, :radio') ? $(this).prop('checked') : $(this).val());
@@ -1083,6 +1050,7 @@ if (!CRM.vars) CRM.vars = {};
if ($el.data('origSize')) {
$el.dialog('option', $el.data('origSize'));
$el.data('origSize', null);
+ $(this).button('option', 'icons', {primary: 'fa-expand'});
} else {
var menuHeight = $('#civicrm-menu').outerHeight();
$el.data('origSize', {
@@ -1091,6 +1059,7 @@ if (!CRM.vars) CRM.vars = {};
height: $el.dialog('option', 'height')
});
$el.dialog('option', {width: '100%', height: ($(window).height() - menuHeight), position: {my: "top", at: "top+"+menuHeight, of: window}});
+ $(this).button('option', 'icons', {primary: 'fa-compress'});
}
$el.trigger('dialogresize');
e.preventDefault();
diff --git a/civicrm/js/jquery/jquery.crmAjaxTable.js b/civicrm/js/jquery/jquery.crmAjaxTable.js
new file mode 100644
index 0000000000..66978e726c
--- /dev/null
+++ b/civicrm/js/jquery/jquery.crmAjaxTable.js
@@ -0,0 +1,59 @@
+// https://civicrm.org/licensing
+(function($, _) {
+ "use strict";
+ /* jshint validthis: true */
+
+ $.fn.crmAjaxTable = function() {
+
+ // Strip the ids from ajax urls to make pageLength storage more generic
+ function simplifyUrl(ajax) {
+ // Datatables ajax prop could be a url string or an object containing the url
+ var url = typeof ajax === 'object' ? ajax.url : ajax;
+ return typeof url === 'string' ? url.replace(/[&?]\w*id=\d+/g, '') : null;
+ }
+
+ return $(this).each(function() {
+ // Recall pageLength for this table
+ var url = simplifyUrl($(this).data('ajax'));
+ if (url && window.localStorage && localStorage['dataTablePageLength:' + url]) {
+ $(this).data('pageLength', localStorage['dataTablePageLength:' + url]);
+ }
+ // Declare the defaults for DataTables
+ var defaults = {
+ "processing": true,
+ "serverSide": true,
+ "order": [],
+ "dom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
+ "pageLength": 25,
+ "pagingType": "full_numbers",
+ "drawCallback": function(settings) {
+ //Add data attributes to cells
+ $('thead th', settings.nTable).each( function( index ) {
+ $.each(this.attributes, function() {
+ if(this.name.match("^cell-")) {
+ var cellAttr = this.name.substring(5);
+ var cellValue = this.value;
+ $('tbody tr', settings.nTable).each( function() {
+ $('td:eq('+ index +')', this).attr( cellAttr, cellValue );
+ });
+ }
+ });
+ });
+ //Reload table after draw
+ $(settings.nTable).trigger('crmLoad');
+ }
+ };
+ //Include any table specific data
+ var settings = $.extend(true, defaults, $(this).data('table'));
+ // Remember pageLength
+ $(this).on('length.dt', function(e, settings, len) {
+ if (settings.ajax && window.localStorage) {
+ localStorage['dataTablePageLength:' + simplifyUrl(settings.ajax)] = len;
+ }
+ });
+ //Make the DataTables call
+ $(this).DataTable(settings);
+ });
+ };
+
+})(CRM.$, CRM._);
diff --git a/civicrm/js/jquery/jquery.crmeditable.js b/civicrm/js/jquery/jquery.crmeditable.js
index 453c496932..624f51b971 100644
--- a/civicrm/js/jquery/jquery.crmeditable.js
+++ b/civicrm/js/jquery/jquery.crmeditable.js
@@ -127,7 +127,7 @@
}
$i.addClass('crm-editable-enabled');
- $i.editable(function(value, settings) {
+ function callback(value, settings) {
$i.addClass('crm-editable-saving');
var
info = $i.crmEditableEntity(),
@@ -165,7 +165,11 @@
.fail(function(data) {
editableSettings.error.call($el[0], info.entity, info.field, value, data);
});
- }, settings);
+ }
+
+ CRM.loadScript(CRM.config.resourceBase + 'packages/jquery/plugins/jquery.jeditable.min.js').done(function() {
+ $i.editable(callback, settings);
+ });
// CRM-15759 - Workaround broken textarea handling in jeditable 1.7.1
$i.click(function() {
@@ -237,8 +241,4 @@
});
};
- $(document).on('crmLoad', function(e) {
- $('.crm-editable', e.target).not('thead *').crmEditable();
- });
-
})(jQuery, CRM._);
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 9c4d6a3c35..d63929e260 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -14,6 +14,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 4.7.18
+
+Released April 5, 2017
+
+- **[Features](release-notes/4.7.18.md#features)**
+- **[Bugs resolved](release-notes/4.7.18.md#bugs)**
+- **[Miscellany](release-notes/4.7.18.md#misc)**
+- **[Credits](release-notes/4.7.18.md#credits)**
+
## CiviCRM 4.7.17
Released March 8, 2017
diff --git a/civicrm/release-notes/4.7.18.md b/civicrm/release-notes/4.7.18.md
new file mode 100644
index 0000000000..0bdd44a7a5
--- /dev/null
+++ b/civicrm/release-notes/4.7.18.md
@@ -0,0 +1,570 @@
+# CiviCRM 4.7.18
+
+Released April 5, 2017
+
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **[CRM-19385](https://issues.civicrm.org/jira/browse/CRM-19385) Look at
+ REMOVING id column from cache tables
+ ([10073](https://github.com/civicrm/civicrm-core/pull/10073) and
+ [10019](https://github.com/civicrm/civicrm-core/pull/10019))**
+
+ Cache tables no longer use auto-incremented ID fields.
+
+- **[CRM-20062](https://issues.civicrm.org/jira/browse/CRM-20062) New counties
+ of Kenya ([9937](https://github.com/civicrm/civicrm-core/pull/9937))**
+
+ Kenya is now divided into 47 counties, treated as "state/province" in CiviCRM.
+
+- **[CRM-20187](https://issues.civicrm.org/jira/browse/CRM-20187) allow class
+ parameter for hook_civicrm_links()
+ ([9901](https://github.com/civicrm/civicrm-core/pull/9901))**
+
+ Links provided to `hook_civicrm_links()` can now specify classes for the `<a>`
+ element.
+
+- **[CRM-20039](https://issues.civicrm.org/jira/browse/CRM-20039) Add
+ supplemental address lines as criteria in Advanced Search
+ ([9850](https://github.com/civicrm/civicrm-core/pull/9850))**
+
+ Searching by supplemental address 1 and 2 (though not 3) is available in the
+ Advanced Search.
+
+- **[CRM-20219](https://issues.civicrm.org/jira/browse/CRM-20219) Switch
+ activity date time to use datepicker in profiles
+ ([9935](https://github.com/civicrm/civicrm-core/pull/9935))**
+
+ The activity date/time field now uses the more standard datepicker rather than
+ the jCalendar widget when used in a profile.
+
+- **Tweak icon when expanding popup to fullscreen
+ ([9961](https://github.com/civicrm/civicrm-core/pull/9961))**
+
+ The expand icon becomes a compress icon after expanding a popup window.
+
+- **[CRM-4287](https://issues.civicrm.org/jira/browse/CRM-4287) - Contact search
+ for email address (& other details) shows only primary detail matches as
+ results ([9772](https://github.com/civicrm/civicrm-core/pull/9772))**
+
+ Search preferences now contain a setting for whether to restrict searches to
+ primary address, phone, email, IM, and OpenID.
+
+### CiviCase
+
+- **[CRM-20302](https://issues.civicrm.org/jira/browse/CRM-20302) Case api
+ improvements ([10017](https://github.com/civicrm/civicrm-core/pull/10017))**
+
+ The Case API now allows for filtering by and returning cases with tags.
+
+- **[CRM-20102](https://issues.civicrm.org/jira/browse/CRM-20102) Case table
+ view ([9940](https://github.com/civicrm/civicrm-core/pull/9940))**
+
+ The Activity API now allows for filtering by and returning activities with
+ Case ID. The Case API now properly handles SQL operators for the `contact_id`
+ field and returns the `case_id.definition` joined field with proper formatting.
+
+### CiviContribute
+
+- **[CRM-20286](https://issues.civicrm.org/jira/browse/CRM-20286) Add card type
+ field on search form
+ ([9999](https://github.com/civicrm/civicrm-core/pull/9999))**
+
+ The Find Contributions and Advanced Search now allow searching by card type.
+
+- **[CRM-20282](https://issues.civicrm.org/jira/browse/CRM-20282) Add credit
+ card type field for Bookkeeping report
+ ([9995](https://github.com/civicrm/civicrm-core/pull/9995))**
+
+ The bookkeeping report now allows for displaying and filtering by card type.
+
+- **[CRM-19674](https://issues.civicrm.org/jira/browse/CRM-19674) Add ability to
+ see at a glance if a contribution is part of a recurring series
+ ([9421](https://github.com/civicrm/civicrm-core/pull/9421))**
+
+ The display of recurring contributions in contribution search results is
+ shorter.
+
+- **[CRM-20272](https://issues.civicrm.org/jira/browse/CRM-20272) Add credit
+ card type field for Contribution Summary Report
+ ([9986](https://github.com/civicrm/civicrm-core/pull/9986))**
+
+ The contribution summary report now allows for displaying and filtering by
+ card type.
+
+- **[CRM-19715](https://issues.civicrm.org/jira/browse/CRM-19715) Remove Close
+ Accounting Period code
+ ([9983](https://github.com/civicrm/civicrm-core/pull/9983) and
+ [9955](https://github.com/civicrm/civicrm-core/pull/9955))**
+
+ The Close Accounting Period interface is removed.
+
+- **[CRM-20058](https://issues.civicrm.org/jira/browse/CRM-20058) Add Credit
+ Card Payment link for partially paid contribution
+ ([9860](https://github.com/civicrm/civicrm-core/pull/9860) and
+ [9941](https://github.com/civicrm/civicrm-core/pull/9941))**
+
+ There is now a separate link for the credit card payment form for partially
+ paid contributions.
+
+- **[CRM-20199](https://issues.civicrm.org/jira/browse/CRM-20199) Contribution
+ searches all include an unindexed join
+ ([9631](https://github.com/civicrm/civicrm-core/pull/9631))**
+
+ The option value table is joined on contribution searches when option values
+ could be provided through pseudoconstants, with improved performance.
+
+- **[CRM-16189](https://issues.civicrm.org/jira/browse/CRM-16189) Improve
+ support for Accrual Method bookkeeping
+ ([8807](https://github.com/civicrm/civicrm-core/pull/8807)) (partial work)**
+
+ The deferred revenue report now operates more like other reports.
+
+- **[CRM-20251](https://issues.civicrm.org/jira/browse/CRM-20251) Make it easier
+ to overwrite front end form help text regarding recurring
+ ([9970](https://github.com/civicrm/civicrm-core/pull/9970))**
+
+ The recurring contribution help text for donors is now prepared when building
+ the form rather than on the template. This makes it easier to modify in
+ hooks.
+
+- **[CRM-20252](https://issues.civicrm.org/jira/browse/CRM-20252) Improve text
+ when processing possibly-delayed-payments
+ ([9971](https://github.com/civicrm/civicrm-core/pull/9971))**
+
+ The "Your contribution has been submitted" text on contribution forms now only
+ appears if the site is still waiting on notification of a successful
+ transaction.
+
+### CiviEvent
+
+- **[CRM-20213](https://issues.civicrm.org/jira/browse/CRM-20213) Switch
+ participant_register_date to use datepicker in profiles
+ ([9922](https://github.com/civicrm/civicrm-core/pull/9922))**
+
+ The registration date field now uses the more standard datepicker rather than
+ the jCalendar widget when used in a profile.
+
+### CiviMember
+
+- **[CRM-20294](https://issues.civicrm.org/jira/browse/CRM-20294) Update
+ membership dates in profiles to use datepicker
+ ([10005](https://github.com/civicrm/civicrm-core/pull/10005))**
+
+ Membership join, start, end, and reminder date fields now use the more
+ standard datepicker rather than the jCalendar widget when used in a profile.
+
+### CiviMail
+
+- **[CRM-19836](https://issues.civicrm.org/jira/browse/CRM-19836) Allow mail
+ bounce processing to create activities for inbound email
+ ([9655](https://github.com/civicrm/civicrm-core/pull/9655))**
+
+ The bounce fetcher can now optionally create activities for tracked replies to
+ CiviMail messages.
+
+### CiviReport
+
+- **[CRM-20255](https://issues.civicrm.org/jira/browse/CRM-20255) Add developer
+ tabs to more reports
+ ([9978](https://github.com/civicrm/civicrm-core/pull/9978))**
+
+ The repeating contribution and event income reports now have the developer tab.
+
+- **[CRM-20242](https://issues.civicrm.org/jira/browse/CRM-20242) Add developer
+ Tab to Activity Detail report
+ ([9965](https://github.com/civicrm/civicrm-core/pull/9965))**
+
+ The Activity Detail report now has the developer tab.
+
+### Drupal Integration Modules
+
+- **[CRM-20186](https://issues.civicrm.org/jira/browse/CRM-20186) Expose legal
+ name in views ([430](https://github.com/civicrm/civicrm-drupal/pull/430) and
+ [429](https://github.com/civicrm/civicrm-drupal/pull/429))**
+
+ The Legal Name field is now available in Drupal Views.
+
+### WordPress Integration
+
+- **[CRM-20225](https://issues.civicrm.org/jira/browse/CRM-20225) Add classes to
+ WordPress basepage
+ ([111](https://github.com/civicrm/civicrm-wordpress/pull/111))**
+
+ When viewing a CiviCRM page using the basepage method, the `<body>` element is
+ given a class name corresponding to the CiviCRM page.
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **[CRM-19773](https://issues.civicrm.org/jira/browse/CRM-19773) Call
+ hook_civicrm_selectWhereClause from the BAOs
+ ([9923](https://github.com/civicrm/civicrm-core/pull/9923) and
+ [9570](https://github.com/civicrm/civicrm-core/pull/9570)) (preliminary work)**
+
+ Reports now check permissions more consistently for viewing entities.
+
+- **[CRM-19124](https://issues.civicrm.org/jira/browse/CRM-19124) Date of birth
+ format varies between hooks and API
+ ([9847](https://github.com/civicrm/civicrm-core/pull/9847))**
+
+ The birth date field is now *mostly* in the format `yyyymmddhhmmss` when it
+ appears in hooks.
+
+- **[CRM-19914](https://issues.civicrm.org/jira/browse/CRM-19914)
+ civicrmHooks.php issues on windows
+ ([9788](https://github.com/civicrm/civicrm-core/pull/9788))**
+
+ On Windows systems, the path to a `civicrmHooks.php` file in the custom PHP
+ directory was not resolving correctly.
+
+- **[CRM-20216](https://issues.civicrm.org/jira/browse/CRM-20216) Dedupe rules
+ should be prevented from being saved if Weight Threshold is null or zero
+ ([10020](https://github.com/civicrm/civicrm-core/pull/10020))**
+
+- **[CRM-19308](https://issues.civicrm.org/jira/browse/CRM-19308) Disallow
+ false-y values for paths purged during cache clears
+ ([8980](https://github.com/civicrm/civicrm-core/pull/8980))**
+
+ This prevents the entire CiviCRM files directory from being deleted on cache
+ clear in certain cases.
+
+- **[CRM-19979](https://issues.civicrm.org/jira/browse/CRM-19979)
+ GroupContact.delete does not work for contacts with status of Pending
+ ([9789](https://github.com/civicrm/civicrm-core/pull/9789)) (completes prior
+ work)**
+
+ This fixes a problem where an enormous contribution value would cause an
+ error on Authorize.net but nonetheless save the value in CiviCRM.
+
+- **News dashlet - don't show count when it's zero
+ ([10002](https://github.com/civicrm/civicrm-core/pull/10002))**
+
+- **[CRM-20254](https://issues.civicrm.org/jira/browse/CRM-20254) Custom CSS
+ files do not include cache buster
+ ([9980](https://github.com/civicrm/civicrm-core/pull/9980))**
+
+- **[CRM-19980](https://issues.civicrm.org/jira/browse/CRM-19980) FIx slow
+ queries due to LOWER on contact name fields
+ ([9802](https://github.com/civicrm/civicrm-core/pull/9802))**
+
+ Some contact fields were being queried with the `LOWER()` function, blocking
+ the performance benefit of indexes. CiviCRM tables use case-insensitive
+ collation, so queries will already be handled in case-insensitive way.
+
+- **[CRM-19051](https://issues.civicrm.org/jira/browse/CRM-19051) Logging -
+ setting to allow offline triggers not respected in all cases
+ ([9602](https://github.com/civicrm/civicrm-core/pull/9602))**
+
+- **Settings ([9420](https://github.com/civicrm/civicrm-core/pull/9420))**
+
+ This resolves a code loop that could occur when retrieving domain settings and
+ removes some obsolete functions from the domain BAO.
+
+- **[CRM-20020](https://issues.civicrm.org/jira/browse/CRM-20020) Advanced
+ search for parent group + another criteria ignores other criteria - shows all
+ group members always
+ ([9836](https://github.com/civicrm/civicrm-core/pull/9836))**
+
+- **[CRM-20023](https://issues.civicrm.org/jira/browse/CRM-20023) Accept
+ state_province_id without state_province in `CRM_Utils_Geocode_*`
+ ([9958](https://github.com/civicrm/civicrm-core/pull/9958) and
+ [9839](https://github.com/civicrm/civicrm-core/pull/9839))**
+
+- **[CRM-20235](https://issues.civicrm.org/jira/browse/CRM-20235) Suppress
+ annoying extension download error messages
+ ([9954](https://github.com/civicrm/civicrm-core/pull/9954))**
+
+ No longer generate a separate pop-up message when CiviCRM is unable to access
+ the extension directory or write to the extensions folder.
+
+- **[CRM-19958](https://issues.civicrm.org/jira/browse/CRM-19958) Problems with
+ contact types (subtypes) which beginning with numbers
+ ([9769](https://github.com/civicrm/civicrm-core/pull/9769))**
+
+- **[CRM-18747](https://issues.civicrm.org/jira/browse/CRM-18747) group
+ descriptions no longer included when listing in profiles
+ ([9946](https://github.com/civicrm/civicrm-core/pull/9946))**
+
+ When groups are included as a checkbox field in a profile form,
+ the descriptions are now displayed as they were in CiviCRM 4.4.x and earlier.
+
+- **[CRM-19993](https://issues.civicrm.org/jira/browse/CRM-19993) Fixes for ISO
+ compliance with countries and counties
+ ([9951](https://github.com/civicrm/civicrm-core/pull/9951))**
+
+ A number of missing, misspelled, or out-of-date country and state/province
+ names are fixed.
+
+- **[CRM-19386](https://issues.civicrm.org/jira/browse/CRM-19386) Date format is
+ not taken into account for custom field on activity import
+ ([9072](https://github.com/civicrm/civicrm-core/pull/9072))**
+
+- **[CRM-15505](https://issues.civicrm.org/jira/browse/CRM-15505) Mailing labels
+ show the state/province name as the abbreviation rather than the full
+ state/province name ([9911](https://github.com/civicrm/civicrm-core/pull/9911)
+ and [9905](https://github.com/civicrm/civicrm-core/pull/9905))**
+
+- **[CRM-20208](https://issues.civicrm.org/jira/browse/CRM-20208) Multiple names
+ for Results Column in profiles
+ ([10004](https://github.com/civicrm/civicrm-core/pull/10004))**
+
+ When viewing a profile's fields, the confusing legacy term "In Selector" was
+ still the label for whether a field appears in the results column.
+
+- **[CRM-20270](https://issues.civicrm.org/jira/browse/CRM-20270) Test suite
+ displays "PHP Warning: declare(encoding=...) ignored because Zend multibyte
+ feature is turned off by settings in"
+ ([9982](https://github.com/civicrm/civicrm-core/pull/9982))**
+
+ The ezcMail package is updated.
+
+- **[CRM-20232](https://issues.civicrm.org/jira/browse/CRM-20232) Not all
+ relationship types available in relationship report filter.
+ ([9947](https://github.com/civicrm/civicrm-core/pull/9947))**
+
+ Symmetrical relationships (e.g. sibling, spouse, etc.) weren't available as
+ filter options in the relationship report.
+
+- **[CRM-19869](https://issues.civicrm.org/jira/browse/CRM-19869) CiviReport:
+ Layout problem multiple-page PDF
+ ([9670](https://github.com/civicrm/civicrm-core/pull/9670))**
+
+- **[CRM-20179](https://issues.civicrm.org/jira/browse/CRM-20179) Upgrade jstree
+ and other clientside performance fixes
+ ([9899](https://github.com/civicrm/civicrm-core/pull/9899))**
+
+### CiviContribute
+
+- **[CRM-19710](https://issues.civicrm.org/jira/browse/CRM-19710) Preserve
+ is_email_receipt parameter through to email sent
+ ([10000](https://github.com/civicrm/civicrm-core/pull/10000))**
+
+ In some cases, the `is_email_receipt` API parameter would fail to trigger a
+ receipt getting sent.
+
+- **[CRM-19900](https://issues.civicrm.org/jira/browse/CRM-19900) Enable/Disable
+ payment processor from summary page only disables live
+ ([9979](https://github.com/civicrm/civicrm-core/pull/9979))**
+
+- **[CRM-20220](https://issues.civicrm.org/jira/browse/CRM-20220) Use text box
+ for signature field on payment processor page
+ ([9936](https://github.com/civicrm/civicrm-core/pull/9936))**
+
+- **[CRM-20146](https://issues.civicrm.org/jira/browse/CRM-20146) check_number
+ toggle: don't hardcode value
+ ([9865](https://github.com/civicrm/civicrm-core/pull/9865))**
+
+ The value of the "check" payment instrument was hard-coded for the purpose of
+ showing and hiding the check number field.
+
+- **[CRM-20334](https://issues.civicrm.org/jira/browse/CRM-20334) Fatal Error on
+ Submit Credit Card Form
+ ([10042](https://github.com/civicrm/civicrm-core/pull/10042))**
+
+- **[CRM-20052](https://issues.civicrm.org/jira/browse/CRM-20052) BillingBlock
+ js not loading as expected in Drupal 8
+ ([9859](https://github.com/civicrm/civicrm-core/pull/9859))**
+
+- **Civi\API\ExternalBatch - Improve test for variables_order/$_ENV
+ ([9969](https://github.com/civicrm/civicrm-core/pull/9969))**
+
+ The ExternalBatch API checks more accurately for a missing `$_ENV` variable.
+
+- **[CRM-20025](https://issues.civicrm.org/jira/browse/CRM-20025) DB Error on
+ email task for advanced search for contributions
+ ([9952](https://github.com/civicrm/civicrm-core/pull/9952))**
+
+- **[CRM-20247](https://issues.civicrm.org/jira/browse/CRM-20247) $is_recur not
+ always assigned to the template for recurring contributions
+ ([9966](https://github.com/civicrm/civicrm-core/pull/9966))**
+
+- **[CRM-20248](https://issues.civicrm.org/jira/browse/CRM-20248) Dummy payment
+ processor on dev sites uses Elavon, not dummy class
+ ([9967](https://github.com/civicrm/civicrm-core/pull/9967))**
+
+ The dummy payment processor ID has been updated in hard-coded sample data.
+
+- **[CRM-19966](https://issues.civicrm.org/jira/browse/CRM-19966) Tax applied
+ repeatedly when 'empty editing' contribution
+ ([9948](https://github.com/civicrm/civicrm-core/pull/9948))**
+
+- **[CRM-20193](https://issues.civicrm.org/jira/browse/CRM-20193) Draw currency
+ from better table on Batch Transaction form
+ ([9930](https://github.com/civicrm/civicrm-core/pull/9930))**
+
+ Currency is now more accurately looked up from `civicrm_entity_financial_trxn`
+ rather than `civicrm_contribution`.
+
+- **[CRM-19937](https://issues.civicrm.org/jira/browse/CRM-19937) entering $
+ (dollar sign) in other amount contribution box makes credit card forms go away
+ ([9745](https://github.com/civicrm/civicrm-core/pull/9745))**
+
+- **[CRM-19741](https://issues.civicrm.org/jira/browse/CRM-19741) Price set and
+ price set value "label" fields are inconsistant to users
+ ([9776](https://github.com/civicrm/civicrm-core/pull/9776))**
+
+ This fixes a bug where the price field label was not saving properly when
+ edited inline.
+
+### CiviMail
+
+- **[CRM-20299](https://issues.civicrm.org/jira/browse/CRM-20299) CiviMail UI:
+ Recipient list does not update for advanced options
+ ([10014](https://github.com/civicrm/civicrm-core/pull/10014))**
+
+- **[CRM-19962](https://issues.civicrm.org/jira/browse/CRM-19962) Name field of
+ AB mailing too short
+ ([9815](https://github.com/civicrm/civicrm-core/pull/9815))**
+
+ The `<input>` tag was missing the `type` attribute of `text`.
+
+- **[CRM-20001](https://issues.civicrm.org/jira/browse/CRM-20001) Tokens in
+ Subject not working
+ ([9824](https://github.com/civicrm/civicrm-core/pull/9824))**
+
+- **[CRM-20206](https://issues.civicrm.org/jira/browse/CRM-20206) `&` encoded to
+ `&` in plain text email checksum links
+ ([9938](https://github.com/civicrm/civicrm-core/pull/9938) and
+ [9917](https://github.com/civicrm/civicrm-core/pull/9917))**
+
+### CiviMember
+
+- **[CRM-19792](https://issues.civicrm.org/jira/browse/CRM-19792) Authorize.net
+ membership renewals with credit card not processed though event regs are
+ ([9662](https://github.com/civicrm/civicrm-core/pull/9662))**
+
+ Renewing a membership would not always provide the email address to the
+ payment processor.
+
+- **[CRM-20342](https://issues.civicrm.org/jira/browse/CRM-20342) Fatal Error on
+ View Membership ([10060](https://github.com/civicrm/civicrm-core/pull/10060))**
+
+- **Enotice fix ([10032](https://github.com/civicrm/civicrm-core/pull/10032))**
+
+ This fixes an occasional PHP notice for a missing variable when batch editing
+ memberships.
+
+### CiviEvent
+
+- **[CRM-20347](https://issues.civicrm.org/jira/browse/CRM-20347) Fatal error on
+ delete participant record with related contribution
+ ([10061](https://github.com/civicrm/civicrm-core/pull/10061))**
+
+- **[CRM-19273](https://issues.civicrm.org/jira/browse/CRM-19273) Changes to
+ Event Selections on Pending (Pay Later) Contribution Not Creating Correct
+ Financial Items Causing Imbalance in Accounting Batch Export
+ ([9998](https://github.com/civicrm/civicrm-core/pull/9998)) (preliminary work)**
+
+### Drupal Integration
+
+- **[CRM-19835](https://issues.civicrm.org/jira/browse/CRM-19835) Installing
+ into D8, DB requirements fail using non-standard port for MySQL
+ ([9910](https://github.com/civicrm/civicrm-core/pull/9910) and
+ [423](https://github.com/civicrm/civicrm-drupal/pull/423))**
+
+- **[CRM-19856](https://issues.civicrm.org/jira/browse/CRM-19856) Get User
+ record url fails in Drupal 8
+ ([9521](https://github.com/civicrm/civicrm-core/pull/9521))**
+
+### WordPress Integration
+
+- **[CRM-19665](https://issues.civicrm.org/jira/browse/CRM-19665) Canonical URL
+ for WP basepage pages is the basepage itself
+ ([107](https://github.com/civicrm/civicrm-wordpress/pull/107))**
+
+ The canonical URL is now set properly (for the new standard `get_canonical_url`
+ filter as well as All-in-one SEO and Yoast SEO) when viewing a frontend page
+ using the basepage (long URL) method.
+
+## <a name="misc"></a>Miscellany
+
+- **[CRM-20239](https://issues.civicrm.org/jira/browse/CRM-20239) Extra tests
+ for the CRM_Contact_BAO_Individual::format function
+ ([9963](https://github.com/civicrm/civicrm-core/pull/9963))**
+
+- **[CRM-20157](https://issues.civicrm.org/jira/browse/CRM-20157) Code cleanup -
+ remove unused & unuseful variables in dedupe classes
+ ([9907](https://github.com/civicrm/civicrm-core/pull/9907))**
+
+- **[CRM-20224](https://issues.civicrm.org/jira/browse/CRM-20224) Cleanup
+ internal event names
+ ([9943](https://github.com/civicrm/civicrm-core/pull/9943))**
+
+- **Minor test tidy up.
+ ([10044](https://github.com/civicrm/civicrm-core/pull/10044))**
+
+- **Fix up test to create line_items & memberships accurately
+ ([10029](https://github.com/civicrm/civicrm-core/pull/10029))**
+
+- **extract two core API permission functions
+ ([10016](https://github.com/civicrm/civicrm-core/pull/10016))**
+
+ API permissions are moved to a function providing them.
+
+- **New GenCodeChecksum for auto-generated DAO files
+ ([10013](https://github.com/civicrm/civicrm-core/pull/10013))**
+
+- **Minor comment fixes & function extraction.
+ ([9751](https://github.com/civicrm/civicrm-core/pull/9751))**
+
+ New `CRM_Core_Form` methods handle adding basic select fields and statistic
+ fields to reports.
+
+- **Fix test to use name that will not cause intermittant errors
+ ([10011](https://github.com/civicrm/civicrm-core/pull/10011))**
+
+- **Correct description of order api
+ ([10008](https://github.com/civicrm/civicrm-core/pull/10008))**
+
+- **(NFC) Update API examples and add example of using user_contact_id as id for
+ current logged in user
+ ([9959](https://github.com/civicrm/civicrm-core/pull/9959))**
+
+- **Update to 4.7.18 ([9956](https://github.com/civicrm/civicrm-core/pull/9956))**
+
+- **[CRM-20200](https://issues.civicrm.org/jira/browse/CRM-20200) Add
+ .editorconfig for easier editor config / coding standards
+ ([9912](https://github.com/civicrm/civicrm-core/pull/9912))**
+
+- **comment changes only
+ ([9931](https://github.com/civicrm/civicrm-core/pull/9931))**
+
+- **Additional unit test, checking membership renewal
+ ([9909](https://github.com/civicrm/civicrm-core/pull/9909))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andrew Hunt; Agileware - Agileware Team; Arkadiusz
+Rzadkowolski; Australian Greens - Seamus Lee; Black Brick Software - David
+Hayes; Christian Wach; CiviCRM - Coleman Watts, Donald Lobo, Jitendra Purohit,
+Kurund Jalmi, Tim Otten; CiviDesk - Sunil Pawar; CompuCorp - Michael Devery;
+Ergon Logic Enterprises - Christopher Gervais; Erich Schulz; Fuzion - Chris
+Burgess, Eileen McNaughton; Jérôme Lebleu; JMA Consulting - Edsel Lopez, Joe
+Murray, Pradeep Nayak; Johan Vervloet; John Kingsnorth; Klaas Eikelboom;
+Lighthouse Design and Consulting - Brian Shaughnessy; Matthew Wire; Progressive
+Technology Project - Jamie McClelland; Romain Thouvenin; Sean Madsen; Semper IT -
+Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Tadpole Collective -
+Kevin Cristiano; Vasantha Kaje; Vikas Kumar; We Move Europe/Caltha - Tomasz
+Pietrzkowski; Wikimedia Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+AmnistÃa Internacional España - Fernando RodrÃguez; Avietech - Jonathan Boeke;
+Blackfly Solutions - Alan Dixon; British Humanist Association - Andrew West;
+Circle Interactive - Dave Jenkins, Martin Castle; CiviCoop - Jaap Jansma;
+CiviCRM - Monish Deb, Yashodha Chaku; CiviDesk - Nicolas Ganivet; CiviHosting -
+Hershel Robinson; CompuCorp - Guanhuan Chen, Mirela Stanila; Dmitry Smirnov;
+Forest CRM Consulting - Tamar Meir; Fuzion - Peter Davis; JMA Consulting - Jon
+Goldberg; Korlon - Stuart Gaston; Minnesota Association of Veterinary
+Technicians - Maureen Parks; Pawel Nowak; Skvare - Mark Hanna; Stuart Parker
diff --git a/civicrm/settings/Contribute.setting.php b/civicrm/settings/Contribute.setting.php
index 54115ddf45..67313e3031 100644
--- a/civicrm/settings/Contribute.setting.php
+++ b/civicrm/settings/Contribute.setting.php
@@ -135,36 +135,6 @@ return array(
'description' => NULL,
'help_text' => NULL,
),
- 'financial_account_bal_enable' => array(
- 'group_name' => 'Contribute Preferences',
- 'group' => 'contribute',
- 'name' => 'financial_account_bal_enable',
- 'type' => 'Integer',
- 'html_type' => 'checkbox',
- 'quick_form_type' => 'Element',
- 'default' => 0,
- 'add' => '4.7',
- 'title' => 'Enable Financial Account Balances',
- 'is_domain' => 1,
- 'is_contact' => 0,
- 'description' => NULL,
- 'help_text' => NULL,
- ),
- 'prior_financial_period' => array(
- 'group_name' => 'Contribute Preferences',
- 'group' => 'contribute',
- 'name' => 'prior_financial_period',
- 'type' => 'activityDate',
- 'quick_form_type' => 'Date',
- 'html_type' => 'Date',
- 'default' => NULL,
- 'add' => '4.7',
- 'title' => 'Prior Financial Period',
- 'is_domain' => 1,
- 'is_contact' => 0,
- 'description' => NULL,
- 'help_text' => NULL,
- ),
'always_post_to_accounts_receivable' => array(
'group_name' => 'Contribute Preferences',
'group' => 'contribute',
diff --git a/civicrm/settings/Search.setting.php b/civicrm/settings/Search.setting.php
index 71f6e677d6..6cc84b3f61 100644
--- a/civicrm/settings/Search.setting.php
+++ b/civicrm/settings/Search.setting.php
@@ -197,4 +197,18 @@ return array(
'description' => 'If set, this will be the default profile used for contact search.',
'help_text' => NULL,
),
+ 'searchPrimaryDetailsOnly' => array(
+ 'group_name' => 'Search Preferences',
+ 'group' => 'Search Preferences',
+ 'name' => 'searchPrimaryDetailsOnly',
+ 'type' => 'Boolean',
+ 'quick_form_type' => 'YesNo',
+ 'default' => 1,
+ 'add' => '4.7',
+ 'title' => 'Search Primary Details Only',
+ 'is_domain' => 1,
+ 'is_contact' => 0,
+ 'description' => 'If enabled, only primary details (eg contact\'s primary email, phone, etc) will be included in Basic and Advanced Search results. Disabling this feature will allow users to match contacts using any email, phone etc detail.',
+ 'help_text' => NULL,
+ ),
);
diff --git a/civicrm/sql/civicrm.mysql b/civicrm/sql/civicrm.mysql
index f1d3a1be5a..00d7d0e68f 100644
--- a/civicrm/sql/civicrm.mysql
+++ b/civicrm/sql/civicrm.mysql
@@ -3519,7 +3519,7 @@ CREATE TABLE `civicrm_case` (
`id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Case ID',
- `case_type_id` int unsigned COMMENT 'FK to civicrm_case_type.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.',
@@ -3536,7 +3536,7 @@ CREATE TABLE `civicrm_case` (
is_deleted
)
-, CONSTRAINT FK_civicrm_case_case_type_id FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type`(`id`) ON DELETE SET NULL
+, CONSTRAINT FK_civicrm_case_case_type_id FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type`(`id`)
) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-- /*******************************************************
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index af17d54251..8242734ecf 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -72,7 +72,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("1028", "Bouvet Island", "BV", "1", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1029", "Brazil", "BR", "2", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1030", "British Indian Ocean Territory", "IO", "4", "0");
-INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1031", "Virgin Islands,British", "VG", "2", "0");
+INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1031", "Virgin Islands, British", "VG", "2", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1032", "Brunei Darussalam", "BN", "4", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1033", "Bulgaria", "BG", "1", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1034", "Burkina Faso", "BF", "5", "0");
@@ -205,7 +205,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("1162", "Oman", "OM", "3", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1163", "Pakistan", "PK", "4", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1164", "Palau", "PW", "4", "0");
-INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1165", "Palestinian Territory", "PS", "3", "0");
+INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1165", "Palestine, State of", "PS", "3", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1166", "Panama", "PA", "2", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1167", "Papua New Guinea", "PG", "4", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1168", "Paraguay", "PY", "2", "0");
@@ -422,7 +422,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(1222, 1101, "SK", "Sikkim"),
(1223, 1101, "TN", "Tamil Nadu"),
(1224, 1101, "TR", "Tripura"),
-(1225, 1101, "UL", "Uttaranchal"),
+(1225, 1101, "UT", "Uttarakhand"),
(1226, 1101, "UP", "Uttar Pradesh"),
(1227, 1101, "WB", "West Bengal"),
(1228, 1101, "AN", "Andaman and Nicobar Islands"),
@@ -2125,11 +2125,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(3345, 1110, "JA", "Jarash"),
(3346, 1110, "MN", "Ma\'an"),
(3347, 1110, "MD", "Madaba"),
-(3348, 1112, "110", "Nairobi Municipality"),
-(3349, 1112, "300", "Coast"),
-(3350, 1112, "500", "North-Eastern Kaskazini Mashariki"),
-(3351, 1112, "700", "Rift Valley"),
-(3352, 1112, "900", "Western Magharibi"),
+
+-- CRM-20062 Outdated provinces for Kenya removed .
+
(3353, 1117, "GB", "Bishkek"),
(3354, 1117, "B", "Batken"),
(3355, 1117, "C", "Chu"),
@@ -3608,7 +3606,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(4860, 1208, "TPQ", "Taipei County"),
(4861, 1208, "TTT", "Taitung County"),
(4862, 1208, "TAO", "Taoyuan County"),
-(4863, 1208, "YUN", "Yunlin Conuty"),
+(4863, 1208, "YUN", "Yunlin County"),
(4864, 1208, "KEE", "Keelung City"),
(4865, 1210, "01", "Arusha"),
(4866, 1210, "02", "Dar-es-Salaam"),
@@ -4297,7 +4295,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(NULL, 1066, "LI", "La Libertad"),
(NULL, 1066, "PA", "La Paz"),
(NULL, 1066, "UN", "La Union"),
-
+
-- CRM-17660 Add missing Cameroon Provinces
(NULL, 1038, "LT", "Littoral"),
(NULL, 1038, "NW", "Nord-Ouest"),
@@ -4313,7 +4311,69 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(NULL, 1076, "MQ", "Martinique"),
(NULL, 1076, "GF", "Guyane"),
(NULL, 1076, "RE", "La Réunion"),
-(NULL, 1076, "YT", "Mayotte");
+(NULL, 1076, "YT", "Mayotte"),
+
+-- CRM-20062 New counties of Kenya.
+(NULL, 1112, "01", "Baringo"),
+(NULL, 1112, "02", "Bomet"),
+(NULL, 1112, "03", "Bungoma"),
+(NULL, 1112, "04", "Busia"),
+(NULL, 1112, "05", "Elgeyo/Marakwet"),
+(NULL, 1112, "06", "Embu"),
+(NULL, 1112, "07", "Garissa"),
+(NULL, 1112, "08", "Homa Bay"),
+(NULL, 1112, "09", "Isiolo"),
+(NULL, 1112, "10", "Kajiado"),
+(NULL, 1112, "11", "Kakamega"),
+(NULL, 1112, "12", "Kericho"),
+(NULL, 1112, "13", "Kiambu"),
+(NULL, 1112, "14", "Kilifi"),
+(NULL, 1112, "15", "Kirinyaga"),
+(NULL, 1112, "16", "Kisii"),
+(NULL, 1112, "17", "Kisumu"),
+(NULL, 1112, "18", "Kitui"),
+(NULL, 1112, "19", "Kwale"),
+(NULL, 1112, "20", "Laikipia"),
+(NULL, 1112, "21", "Lamu"),
+(NULL, 1112, "22", "Machakos"),
+(NULL, 1112, "23", "Makueni"),
+(NULL, 1112, "24", "Mandera"),
+(NULL, 1112, "25", "Marsabit"),
+(NULL, 1112, "26", "Meru"),
+(NULL, 1112, "27", "Migori"),
+(NULL, 1112, "28", "Mombasa"),
+(NULL, 1112, "29", "Murang'a"),
+(NULL, 1112, "30", "Nairobi City"),
+(NULL, 1112, "31", "Nakuru"),
+(NULL, 1112, "32", "Nandi"),
+(NULL, 1112, "33", "Narok"),
+(NULL, 1112, "34", "Nyamira"),
+(NULL, 1112, "35", "Nyandarua"),
+(NULL, 1112, "36", "Nyeri"),
+(NULL, 1112, "37", "Samburu"),
+(NULL, 1112, "38", "Siaya"),
+(NULL, 1112, "39", "Taita/Taveta"),
+(NULL, 1112, "40", "Tana River"),
+(NULL, 1112, "41", "Tharaka-Nithi"),
+(NULL, 1112, "42", "Trans Nzoia"),
+(NULL, 1112, "43", "Turkana"),
+(NULL, 1112, "44", "Uasin Gishu"),
+(NULL, 1112, "45", "Vihiga"),
+(NULL, 1112, "46", "Wajir"),
+(NULL, 1112, "47", "West Pokot"),
+
+-- CRM-19993 Fixes for ISO compliance with countries and counties
+-- Add states for: India, Ghana, Sierra Leone, Saint Kitts & Nevis
+(NULL, 1101, "CH", "Chandigarh"),
+(NULL, 1083, "CP", "Central"),
+(NULL, 1083, "EP", "Eastern"),
+(NULL, 1083, "NP", "Northern"),
+(NULL, 1083, "WP", "Western"),
+(NULL, 1181, "K", "Saint Kitts"),
+(NULL, 1181, "N", "Nevis"),
+(NULL, 1190, "E", "Eastern"),
+(NULL, 1190, "N", "Northern"),
+(NULL, 1190, "S", "Southern");
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
@@ -23193,7 +23253,6 @@ VALUES
( @domainID, 'civicrm/admin/contribute/managePremiums?reset=1', 'Premiums (Thank-you Gifts)', 'Premiums', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 12 ),
( @domainID, 'civicrm/admin/price?reset=1&action=add', 'New Price Set', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', NULL, 13 ),
( @domainID, 'civicrm/admin/price?reset=1', 'Manage Price Sets', 'Manage Price Sets', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 14 ),
- ( @domainID, 'civicrm/admin/contribute/closeaccperiod?reset=1', 'Close Accounting Period', 'Close Accounting Period', 'access CiviContribute,administer CiviCRM,administer Accounting', 'AND', @contributionlastID, '1', NULL, 15 ),
( @domainID, 'civicrm/financial/batch?reset=1&action=add', 'New Batch', 'New Batch', 'create manual batch', 'AND', @financialTransactionID, '1', NULL, 1 ),
( @domainID, 'civicrm/financial/financialbatches?reset=1&batchStatus=1', 'Open Batches', 'Open Batches', 'view own manual batches,view all manual batches', 'OR', @financialTransactionID, '1', NULL, 2 ),
@@ -23854,4 +23913,4 @@ INSERT INTO `civicrm_report_instance`
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 = '4.7.17';
+UPDATE civicrm_domain SET version = '4.7.18';
diff --git a/civicrm/sql/civicrm_dummy_processor.mysql b/civicrm/sql/civicrm_dummy_processor.mysql
index f61a81b6a1..70ede786c6 100644
--- a/civicrm/sql/civicrm_dummy_processor.mysql
+++ b/civicrm/sql/civicrm_dummy_processor.mysql
@@ -1,5 +1,5 @@
-INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 9, 1, 1, 0, 'dummy', NULL, NULL, 'http://dummy.com', NULL, 'http://dummyrecur.com', NULL, NULL, 'Payment_Dummy', 1, 1, 1);
-INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 9, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Payment_Dummy', 1, 1, 1);
+INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 8, 1, 1, 0, 'dummy', NULL, NULL, 'http://dummy.com', NULL, 'http://dummyrecur.com', NULL, NULL, 'Payment_Dummy', 1, 1, 1);
+INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 8, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Payment_Dummy', 1, 1, 1);
SELECT @dp := max(id) from civicrm_payment_processor where name = 'Test Processor' AND is_test = 0;
SELECT @dpTest := max(id) from civicrm_payment_processor where name = 'Test Processor' AND is_test = 1;
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 8e692636fb..a4c1dfb913 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.17',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.18',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
@@ -976,7 +976,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_navigation` WRITE;
/*!40000 ALTER TABLE `civicrm_navigation` DISABLE KEYS */;
-INSERT INTO `civicrm_navigation` (`id`, `domain_id`, `label`, `name`, `url`, `permission`, `permission_operator`, `parent_id`, `is_active`, `has_separator`, `weight`) VALUES (1,1,'Home','Home','civicrm/dashboard?reset=1',NULL,'',NULL,1,NULL,0),(2,1,'Search','Search...',NULL,NULL,'',NULL,1,NULL,10),(3,1,'Find Contacts','Find Contacts','civicrm/contact/search?reset=1',NULL,'',2,1,NULL,1),(4,1,'Advanced Search','Advanced Search','civicrm/contact/search/advanced?reset=1',NULL,'',2,1,NULL,2),(5,1,'Full-text Search','Full-text Search','civicrm/contact/search/custom?csid=15&reset=1',NULL,'',2,1,NULL,3),(6,1,'Search Builder','Search Builder','civicrm/contact/search/builder?reset=1',NULL,'',2,1,1,4),(7,1,'Find Cases','Find Cases','civicrm/case/search?reset=1','access my cases and activities,access all cases and activities','OR',2,1,NULL,5),(8,1,'Find Contributions','Find Contributions','civicrm/contribute/search?reset=1','access CiviContribute','',2,1,NULL,6),(9,1,'Find Mailings','Find Mailings','civicrm/mailing?reset=1','access CiviMail','',2,1,NULL,7),(10,1,'Find Memberships','Find Memberships','civicrm/member/search?reset=1','access CiviMember','',2,1,NULL,8),(11,1,'Find Participants','Find Participants','civicrm/event/search?reset=1','access CiviEvent','',2,1,NULL,9),(12,1,'Find Pledges','Find Pledges','civicrm/pledge/search?reset=1','access CiviPledge','',2,1,NULL,10),(13,1,'Find Activities','Find Activities','civicrm/activity/search?reset=1',NULL,'',2,1,1,11),(14,1,'Custom Searches','Custom Searches','civicrm/contact/search/custom/list?reset=1',NULL,'',2,1,NULL,12),(15,1,'Contacts','Contacts',NULL,NULL,'',NULL,1,NULL,20),(16,1,'New Individual','New Individual','civicrm/contact/add?reset=1&ct=Individual','add contacts','',15,1,NULL,1),(17,1,'New Household','New Household','civicrm/contact/add?reset=1&ct=Household','add contacts','',15,1,NULL,2),(18,1,'New Organization','New Organization','civicrm/contact/add?reset=1&ct=Organization','add contacts','',15,1,1,3),(19,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1','access CiviReport','',15,1,1,4),(20,1,'New Activity','New Activity','civicrm/activity?reset=1&action=add&context=standalone',NULL,'',15,1,NULL,5),(21,1,'New Email','New Email','civicrm/activity/email/add?atype=3&action=add&reset=1&context=standalone',NULL,'',15,1,1,6),(22,1,'Import Contacts','Import Contacts','civicrm/import/contact?reset=1','import contacts','',15,1,NULL,7),(23,1,'Import Activities','Import Activities','civicrm/import/activity?reset=1','import contacts','',15,1,1,8),(24,1,'New Group','New Group','civicrm/group/add?reset=1','edit groups','',15,1,NULL,9),(25,1,'Manage Groups','Manage Groups','civicrm/group?reset=1','access CiviCRM','',15,1,1,10),(26,1,'New Tag','New Tag','civicrm/tag?reset=1&action=add','manage tags','',15,1,NULL,11),(27,1,'Manage Tags (Categories)','Manage Tags (Categories)','civicrm/tag?reset=1','manage tags','',15,1,1,12),(28,1,'Find and Merge Duplicate Contacts','Find and Merge Duplicate Contacts','civicrm/contact/deduperules?reset=1','administer dedupe rules,merge duplicate contacts','OR',15,1,NULL,13),(29,1,'Contributions','Contributions',NULL,'access CiviContribute','',NULL,1,NULL,30),(30,1,'Dashboard','Dashboard','civicrm/contribute?reset=1','access CiviContribute','',29,1,NULL,1),(31,1,'New Contribution','New Contribution','civicrm/contribute/add?reset=1&action=add&context=standalone','access CiviContribute,edit contributions','AND',29,1,NULL,2),(32,1,'Find Contributions','Find Contributions','civicrm/contribute/search?reset=1','access CiviContribute','',29,1,NULL,3),(33,1,'Contribution Reports','Contribution Reports','civicrm/report/list?compid=2&reset=1','access CiviContribute','',29,1,1,4),(34,1,'Import Contributions','Import Contributions','civicrm/contribute/import?reset=1','access CiviContribute,edit contributions','AND',29,1,1,5),(35,1,'Batch Data Entry','Batch Data Entry','civicrm/batch?reset=1','access CiviContribute','',29,1,NULL,7),(36,1,'Pledges','Pledges',NULL,'access CiviPledge','',29,1,1,6),(37,1,'Accounting Batches','Accounting Batches',NULL,'view own manual batches,view all manual batches','OR',29,1,1,8),(38,1,'Dashboard','Dashboard','civicrm/pledge?reset=1','access CiviPledge','',36,1,NULL,1),(39,1,'New Pledge','New Pledge','civicrm/pledge/add?reset=1&action=add&context=standalone','access CiviPledge,edit pledges','AND',36,1,NULL,2),(40,1,'Find Pledges','Find Pledges','civicrm/pledge/search?reset=1','access CiviPledge','',36,1,NULL,3),(41,1,'Pledge Reports','Pledge Reports','civicrm/report/list?compid=6&reset=1','access CiviPledge','',36,1,0,4),(42,1,'New Contribution Page','New Contribution Page','civicrm/admin/contribute/add?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',29,1,NULL,9),(43,1,'Manage Contribution Pages','Manage Contribution Pages','civicrm/admin/contribute?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,10),(44,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=contribute','access CiviContribute,administer CiviCRM','AND',29,1,NULL,11),(45,1,'Premiums (Thank-you Gifts)','Premiums','civicrm/admin/contribute/managePremiums?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,12),(46,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',29,1,NULL,13),(47,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,14),(48,1,'Close Accounting Period','Close Accounting Period','civicrm/admin/contribute/closeaccperiod?reset=1','access CiviContribute,administer CiviCRM,administer Accounting','AND',29,1,NULL,15),(49,1,'New Batch','New Batch','civicrm/financial/batch?reset=1&action=add','create manual batch','AND',37,1,NULL,1),(50,1,'Open Batches','Open Batches','civicrm/financial/financialbatches?reset=1&batchStatus=1','view own manual batches,view all manual batches','OR',37,1,NULL,2),(51,1,'Closed Batches','Closed Batches','civicrm/financial/financialbatches?reset=1&batchStatus=2','view own manual batches,view all manual batches','OR',37,1,NULL,3),(52,1,'Exported Batches','Exported Batches','civicrm/financial/financialbatches?reset=1&batchStatus=5','view own manual batches,view all manual batches','OR',37,1,NULL,4),(53,1,'Events','Events',NULL,'access CiviEvent','',NULL,1,NULL,40),(54,1,'Dashboard','CiviEvent Dashboard','civicrm/event?reset=1','access CiviEvent','',53,1,NULL,1),(55,1,'Register Event Participant','Register Event Participant','civicrm/participant/add?reset=1&action=add&context=standalone','access CiviEvent,edit event participants','AND',53,1,NULL,2),(56,1,'Find Participants','Find Participants','civicrm/event/search?reset=1','access CiviEvent','',53,1,NULL,3),(57,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1','access CiviEvent','',53,1,1,4),(58,1,'Import Participants','Import Participants','civicrm/event/import?reset=1','access CiviEvent,edit event participants','AND',53,1,1,5),(59,1,'New Event','New Event','civicrm/event/add?reset=1&action=add','access CiviEvent,edit all events','AND',53,1,NULL,6),(60,1,'Manage Events','Manage Events','civicrm/event/manage?reset=1','access CiviEvent,edit all events','AND',53,1,1,7),(61,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=event','access CiviEvent,administer CiviCRM','AND',53,1,1,8),(62,1,'Event Templates','Event Templates','civicrm/admin/eventTemplate?reset=1','access CiviEvent,edit all events','AND',53,1,1,9),(63,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviEvent,edit all events','AND',53,1,NULL,10),(64,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviEvent,edit all events','AND',53,1,NULL,11),(65,1,'Mailings','Mailings',NULL,'access CiviMail,create mailings,approve mailings,schedule mailings','OR',NULL,1,NULL,50),(66,1,'New Mailing','New Mailing','civicrm/mailing/send?reset=1','access CiviMail,create mailings','OR',65,1,NULL,1),(67,1,'Draft and Unscheduled Mailings','Draft and Unscheduled Mailings','civicrm/mailing/browse/unscheduled?reset=1&scheduled=false','access CiviMail,create mailings,schedule mailings','OR',65,1,NULL,2),(68,1,'Scheduled and Sent Mailings','Scheduled and Sent Mailings','civicrm/mailing/browse/scheduled?reset=1&scheduled=true','access CiviMail,approve mailings,create mailings,schedule mailings','OR',65,1,NULL,3),(69,1,'Archived Mailings','Archived Mailings','civicrm/mailing/browse/archived?reset=1','access CiviMail,create mailings','OR',65,1,NULL,4),(70,1,'Mailing Reports','Mailing Reports','civicrm/report/list?compid=4&reset=1','access CiviMail','',65,1,1,5),(71,1,'Headers, Footers, and Automated Messages','Headers, Footers, and Automated Messages','civicrm/admin/component?reset=1','access CiviMail,administer CiviCRM','AND',65,1,NULL,6),(72,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','edit message templates','',65,1,NULL,7),(73,1,'From Email Addresses','From Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',65,1,1,8),(74,1,'New SMS','New SMS','civicrm/sms/send?reset=1','administer CiviCRM',NULL,65,1,NULL,9),(75,1,'Find Mass SMS','Find Mass SMS','civicrm/mailing/browse?reset=1&sms=1','administer CiviCRM',NULL,65,1,1,10),(76,1,'New A/B Test','New A/B Test','civicrm/a/#/abtest/new','access CiviMail','',65,1,NULL,15),(77,1,'Manage A/B Tests','Manage A/B Tests','civicrm/a/#/abtest','access CiviMail','',65,1,1,16),(78,1,'Memberships','Memberships',NULL,'access CiviMember','',NULL,1,NULL,60),(79,1,'Dashboard','Dashboard','civicrm/member?reset=1','access CiviMember','',78,1,NULL,1),(80,1,'New Membership','New Membership','civicrm/member/add?reset=1&action=add&context=standalone','access CiviMember,edit memberships','AND',78,1,NULL,2),(81,1,'Find Memberships','Find Memberships','civicrm/member/search?reset=1','access CiviMember','',78,1,NULL,3),(82,1,'Membership Reports','Membership Reports','civicrm/report/list?compid=3&reset=1','access CiviMember','',78,1,1,4),(83,1,'Batch Data Entry','Batch Data Entry','civicrm/batch?reset=1','access CiviContribute','',78,1,NULL,5),(84,1,'Import Memberships','Import Members','civicrm/member/import?reset=1','access CiviMember,edit memberships','AND',78,1,1,6),(85,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviMember,administer CiviCRM','AND',78,1,NULL,7),(86,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviMember,administer CiviCRM','AND',78,1,NULL,8),(87,1,'Campaigns','Campaigns',NULL,'interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',NULL,1,NULL,70),(88,1,'Dashboard','Dashboard','civicrm/campaign?reset=1','manage campaign,administer CiviCampaign','OR',87,1,NULL,1),(89,1,'Surveys','Survey Dashboard','civicrm/campaign?reset=1&subPage=survey','manage campaign,administer CiviCampaign','OR',88,1,NULL,1),(90,1,'Petitions','Petition Dashboard','civicrm/campaign?reset=1&subPage=petition','manage campaign,administer CiviCampaign','OR',88,1,NULL,2),(91,1,'Campaigns','Campaign Dashboard','civicrm/campaign?reset=1&subPage=campaign','manage campaign,administer CiviCampaign','OR',88,1,NULL,3),(92,1,'New Campaign','New Campaign','civicrm/campaign/add?reset=1','manage campaign,administer CiviCampaign','OR',87,1,NULL,2),(93,1,'New Survey','New Survey','civicrm/survey/add?reset=1','manage campaign,administer CiviCampaign','OR',87,1,NULL,3),(94,1,'New Petition','New Petition','civicrm/petition/add?reset=1','manage campaign,administer CiviCampaign','OR',87,1,NULL,4),(95,1,'Reserve Respondents','Reserve Respondents','civicrm/survey/search?reset=1&op=reserve','administer CiviCampaign,manage campaign,reserve campaign contacts','OR',87,1,NULL,5),(96,1,'Interview Respondents','Interview Respondents','civicrm/survey/search?reset=1&op=interview','administer CiviCampaign,manage campaign,interview campaign contacts','OR',87,1,NULL,6),(97,1,'Release Respondents','Release Respondents','civicrm/survey/search?reset=1&op=release','administer CiviCampaign,manage campaign,release campaign contacts','OR',87,1,NULL,7),(98,1,'Campaign Reports','Campaign Reports','civicrm/report/list?compid=9&reset=1','interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',87,1,1,8),(99,1,'Conduct Survey','Conduct Survey','civicrm/campaign/vote?reset=1','administer CiviCampaign,manage campaign,reserve campaign contacts,interview campaign contacts','OR',87,1,NULL,9),(100,1,'GOTV (Voter Tracking)','Voter Listing','civicrm/campaign/gotv?reset=1','administer CiviCampaign,manage campaign,release campaign contacts,gotv campaign contacts','OR',87,1,NULL,10),(101,1,'Cases','Cases',NULL,'access my cases and activities,access all cases and activities','OR',NULL,1,NULL,80),(102,1,'Dashboard','Dashboard','civicrm/case?reset=1','access my cases and activities,access all cases and activities','OR',101,1,NULL,1),(103,1,'New Case','New Case','civicrm/case/add?reset=1&action=add&atype=13&context=standalone','add cases,access all cases and activities','OR',101,1,NULL,2),(104,1,'Find Cases','Find Cases','civicrm/case/search?reset=1','access my cases and activities,access all cases and activities','OR',101,1,1,3),(105,1,'Case Reports','Case Reports','civicrm/report/list?compid=7&reset=1','access my cases and activities,access all cases and activities,administer CiviCase','OR',101,1,0,4),(106,1,'Grants','Grants',NULL,'access CiviGrant','',NULL,1,NULL,90),(107,1,'Dashboard','Dashboard','civicrm/grant?reset=1','access CiviGrant','',106,1,NULL,1),(108,1,'New Grant','New Grant','civicrm/grant/add?reset=1&action=add&context=standalone','access CiviGrant,edit grants','AND',106,1,NULL,2),(109,1,'Find Grants','Find Grants','civicrm/grant/search?reset=1','access CiviGrant','',106,1,1,3),(110,1,'Grant Reports','Grant Reports','civicrm/report/list?compid=5&reset=1','access CiviGrant','',106,1,0,4),(111,1,'Administer','Administer',NULL,'administer CiviCRM','',NULL,1,NULL,100),(112,1,'Administration Console','Administration Console','civicrm/admin?reset=1','administer CiviCRM','',111,1,NULL,1),(113,1,'System Status','System Status','civicrm/a/#/status','administer CiviCRM','',112,1,NULL,0),(114,1,'Configuration Checklist','Configuration Checklist','civicrm/admin/configtask?reset=1','administer CiviCRM','',112,1,NULL,1),(115,1,'Customize Data and Screens','Customize Data and Screens',NULL,'administer CiviCRM','',111,1,NULL,3),(116,1,'Custom Fields','Custom Fields','civicrm/admin/custom/group?reset=1','administer CiviCRM','',115,1,NULL,1),(117,1,'Profiles','Profiles','civicrm/admin/uf/group?reset=1','administer CiviCRM','',115,1,NULL,2),(118,1,'Tags (Categories)','Tags (Categories)','civicrm/tag?reset=1','administer CiviCRM','',115,1,NULL,3),(119,1,'Activity Types','Activity Types','civicrm/admin/options/activity_type?reset=1','administer CiviCRM','',115,1,NULL,4),(120,1,'Relationship Types','Relationship Types','civicrm/admin/reltype?reset=1','administer CiviCRM','',115,1,NULL,5),(121,1,'Contact Types','Contact Types','civicrm/admin/options/subtype?reset=1','administer CiviCRM','',115,1,NULL,6),(122,1,'Display Preferences','Display Preferences','civicrm/admin/setting/preferences/display?reset=1','administer CiviCRM','',115,1,NULL,9),(123,1,'Search Preferences','Search Preferences','civicrm/admin/setting/search?reset=1','administer CiviCRM','',115,1,NULL,10),(124,1,'Date Preferences','Date Preferences','civicrm/admin/setting/preferences/date?reset=1','administer CiviCRM','',115,1,NULL,11),(125,1,'Navigation Menu','Navigation Menu','civicrm/admin/menu?reset=1','administer CiviCRM','',115,1,NULL,12),(126,1,'Word Replacements','Word Replacements','civicrm/admin/options/wordreplacements?reset=1','administer CiviCRM','',115,1,NULL,13),(127,1,'Manage Custom Searches','Manage Custom Searches','civicrm/admin/options/custom_search?reset=1','administer CiviCRM','',115,1,NULL,14),(128,1,'Dropdown Options','Dropdown Options',NULL,'administer CiviCRM','',115,1,NULL,8),(129,1,'Gender Options','Gender Options','civicrm/admin/options/gender?reset=1','administer CiviCRM','',128,1,NULL,1),(130,1,'Individual Prefixes (Ms, Mr...)','Individual Prefixes (Ms, Mr...)','civicrm/admin/options/individual_prefix?reset=1','administer CiviCRM','',128,1,NULL,2),(131,1,'Individual Suffixes (Jr, Sr...)','Individual Suffixes (Jr, Sr...)','civicrm/admin/options/individual_suffix?reset=1','administer CiviCRM','',128,1,NULL,3),(132,1,'Instant Messenger Services','Instant Messenger Services','civicrm/admin/options/instant_messenger_service?reset=1','administer CiviCRM','',128,1,NULL,4),(133,1,'Location Types (Home, Work...)','Location Types (Home, Work...)','civicrm/admin/locationType?reset=1','administer CiviCRM','',128,1,NULL,5),(134,1,'Mobile Phone Providers','Mobile Phone Providers','civicrm/admin/options/mobile_provider?reset=1','administer CiviCRM','',128,1,NULL,6),(135,1,'Phone Types','Phone Types','civicrm/admin/options/phone_type?reset=1','administer CiviCRM','',128,1,NULL,7),(136,1,'Website Types','Website Types','civicrm/admin/options/website_type?reset=1','administer CiviCRM','',128,1,NULL,8),(137,1,'Communications','Communications',NULL,'administer CiviCRM','',111,1,NULL,4),(138,1,'Organization Address and Contact Info','Organization Address and Contact Info','civicrm/admin/domain?action=update&reset=1','administer CiviCRM','',137,1,NULL,1),(139,1,'FROM Email Addresses','FROM Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',137,1,NULL,2),(140,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','administer CiviCRM','',137,1,NULL,3),(141,1,'Schedule Reminders','Schedule Reminders','civicrm/admin/scheduleReminders?reset=1','administer CiviCRM','',137,1,NULL,4),(142,1,'Preferred Communication Methods','Preferred Communication Methods','civicrm/admin/options/preferred_communication_method?reset=1','administer CiviCRM','',137,1,NULL,5),(143,1,'Label Formats','Label Formats','civicrm/admin/labelFormats?reset=1','administer CiviCRM','',137,1,NULL,6),(144,1,'Print Page (PDF) Formats','Print Page (PDF) Formats','civicrm/admin/pdfFormats?reset=1','administer CiviCRM','',137,1,NULL,7),(145,1,'Communication Style Options','Communication Style Options','civicrm/admin/options/communication_style?reset=1','administer CiviCRM','',137,1,NULL,8),(146,1,'Email Greeting Formats','Email Greeting Formats','civicrm/admin/options/email_greeting?reset=1','administer CiviCRM','',137,1,NULL,9),(147,1,'Postal Greeting Formats','Postal Greeting Formats','civicrm/admin/options/postal_greeting?reset=1','administer CiviCRM','',137,1,NULL,10),(148,1,'Addressee Formats','Addressee Formats','civicrm/admin/options/addressee?reset=1','administer CiviCRM','',137,1,NULL,11),(149,1,'Localization','Localization',NULL,'administer CiviCRM','',111,1,NULL,6),(150,1,'Languages, Currency, Locations','Languages, Currency, Locations','civicrm/admin/setting/localization?reset=1','administer CiviCRM','',149,1,NULL,1),(151,1,'Address Settings','Address Settings','civicrm/admin/setting/preferences/address?reset=1','administer CiviCRM','',149,1,NULL,2),(152,1,'Date Formats','Date Formats','civicrm/admin/setting/date?reset=1','administer CiviCRM','',149,1,NULL,3),(153,1,'Preferred Language Options','Preferred Language Options','civicrm/admin/options/languages?reset=1','administer CiviCRM','',149,1,NULL,4),(154,1,'Users and Permissions','Users and Permissions',NULL,'administer CiviCRM','',111,1,NULL,7),(155,1,'Permissions (Access Control)','Permissions (Access Control)','civicrm/admin/access?reset=1','administer CiviCRM','',154,1,NULL,1),(156,1,'Synchronize Users to Contacts','Synchronize Users to Contacts','civicrm/admin/synchUser?reset=1','administer CiviCRM','',154,1,NULL,2),(157,1,'System Settings','System Settings',NULL,'administer CiviCRM','',111,1,NULL,8),(158,1,'Components','Enable Components','civicrm/admin/setting/component?reset=1','administer CiviCRM','',157,1,NULL,1),(159,1,'Connections','Connections','civicrm/a/#/cxn','administer CiviCRM','',157,1,NULL,2),(160,1,'Extensions','Manage Extensions','civicrm/admin/extensions?reset=1','administer CiviCRM','',157,1,1,3),(161,1,'Cleanup Caches and Update Paths','Cleanup Caches and Update Paths','civicrm/admin/setting/updateConfigBackend?reset=1','administer CiviCRM','',157,1,NULL,4),(162,1,'CMS Database Integration','CMS Integration','civicrm/admin/setting/uf?reset=1','administer CiviCRM','',157,1,NULL,5),(163,1,'Debugging and Error Handling','Debugging and Error Handling','civicrm/admin/setting/debug?reset=1','administer CiviCRM','',157,1,NULL,6),(164,1,'Directories','Directories','civicrm/admin/setting/path?reset=1','administer CiviCRM','',157,1,NULL,7),(165,1,'Import/Export Mappings','Import/Export Mappings','civicrm/admin/mapping?reset=1','administer CiviCRM','',157,1,NULL,8),(166,1,'Mapping and Geocoding','Mapping and Geocoding','civicrm/admin/setting/mapping?reset=1','administer CiviCRM','',157,1,NULL,9),(167,1,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','civicrm/admin/setting/misc?reset=1','administer CiviCRM','',157,1,NULL,10),(168,1,'Multi Site Settings','Multi Site Settings','civicrm/admin/setting/preferences/multisite?reset=1','administer CiviCRM','',157,1,NULL,11),(169,1,'Option Groups','Option Groups','civicrm/admin/options?reset=1','administer CiviCRM','',157,1,NULL,12),(170,1,'Outbound Email (SMTP/Sendmail)','Outbound Email','civicrm/admin/setting/smtp?reset=1','administer CiviCRM','',157,1,NULL,13),(171,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',157,1,NULL,14),(172,1,'Resource URLs','Resource URLs','civicrm/admin/setting/url?reset=1','administer CiviCRM','',157,1,NULL,15),(173,1,'Safe File Extensions','Safe File Extensions','civicrm/admin/options/safe_file_extension?reset=1','administer CiviCRM','',157,1,NULL,16),(174,1,'Scheduled Jobs','Scheduled Jobs','civicrm/admin/job?reset=1','administer CiviCRM','',157,1,NULL,17),(175,1,'SMS Providers','SMS Providers','civicrm/admin/sms/provider?reset=1','administer CiviCRM','',157,1,NULL,18),(176,1,'CiviCampaign','CiviCampaign',NULL,'administer CiviCampaign,administer CiviCRM','AND',111,1,NULL,9),(177,1,'Survey Types','Survey Types','civicrm/admin/campaign/surveyType?reset=1','administer CiviCampaign','',176,1,NULL,1),(178,1,'Campaign Types','Campaign Types','civicrm/admin/options/campaign_type?reset=1','administer CiviCampaign','',176,1,NULL,2),(179,1,'Campaign Status','Campaign Status','civicrm/admin/options/campaign_status?reset=1','administer CiviCampaign','',176,1,NULL,3),(180,1,'Engagement Index','Engagement Index','civicrm/admin/options/engagement_index?reset=1','administer CiviCampaign','',176,1,NULL,4),(181,1,'CiviCampaign Component Settings','CiviCampaign Component Settings','civicrm/admin/setting/preferences/campaign?reset=1','administer CiviCampaign','',176,1,NULL,5),(182,1,'CiviCase','CiviCase',NULL,'administer CiviCase',NULL,111,1,NULL,10),(183,1,'Case Types','Case Types','civicrm/a/#/caseType','administer CiviCase',NULL,182,1,NULL,1),(184,1,'Redaction Rules','Redaction Rules','civicrm/admin/options/redaction_rule?reset=1','administer CiviCase',NULL,182,1,NULL,2),(185,1,'Case Statuses','Case Statuses','civicrm/admin/options/case_status?reset=1','administer CiviCase',NULL,182,1,NULL,3),(186,1,'Encounter Medium','Encounter Medium','civicrm/admin/options/encounter_medium?reset=1','administer CiviCase',NULL,182,1,NULL,4),(187,1,'CiviContribute','CiviContribute',NULL,'access CiviContribute,administer CiviCRM','AND',111,1,NULL,11),(188,1,'New Contribution Page','New Contribution Page','civicrm/admin/contribute?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',187,1,NULL,6),(189,1,'Manage Contribution Pages','Manage Contribution Pages','civicrm/admin/contribute?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,1,7),(190,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=contribute','access CiviContribute,administer CiviCRM','AND',187,1,NULL,8),(191,1,'Premiums (Thank-you Gifts)','Premiums','civicrm/admin/contribute/managePremiums?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,1,9),(192,1,'Financial Types','Financial Types','civicrm/admin/financial/financialType?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,NULL,10),(193,1,'Financial Accounts','Financial Accounts','civicrm/admin/financial/financialAccount?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,NULL,11),(194,1,'Payment Methods','Payment Instruments','civicrm/admin/options/payment_instrument?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,NULL,12),(195,1,'Accepted Credit Cards','Accepted Credit Cards','civicrm/admin/options/accept_creditcard?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,NULL,13),(196,1,'Soft Credit Types','Soft Credit Types','civicrm/admin/options/soft_credit_type?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,1,14),(197,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',187,1,NULL,15),(198,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviContribute,administer CiviCRM','AND',187,1,NULL,16),(199,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',187,1,NULL,17),(200,1,'CiviContribute Component Settings','CiviContribute Component Settings','civicrm/admin/setting/preferences/contribute?reset=1','administer CiviCRM','',187,1,NULL,18),(201,1,'CiviEvent','CiviEvent',NULL,'access CiviEvent,administer CiviCRM','AND',111,1,NULL,12),(202,1,'New Event','New Event','civicrm/event/add?reset=1&action=add','access CiviEvent,administer CiviCRM','AND',201,1,NULL,1),(203,1,'Manage Events','Manage Events','civicrm/event/manage?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,1,2),(204,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=event','access CiviEvent,administer CiviCRM','AND',201,1,1,3),(205,1,'Event Templates','Event Templates','civicrm/admin/eventTemplate?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,1,4),(206,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviEvent,administer CiviCRM','AND',201,1,NULL,5),(207,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,1,6),(208,1,'Event Types','Event Types','civicrm/admin/options/event_type?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,7),(209,1,'Participant Statuses','Participant Statuses','civicrm/admin/participant_status?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,8),(210,1,'Participant Roles','Participant Roles','civicrm/admin/options/participant_role?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,9),(211,1,'Participant Listing Options','Participant Listing Options','civicrm/admin/options/participant_listing?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,10),(212,1,'Event Name Badge Layouts','Event Name Badge Layouts','civicrm/admin/badgelayout?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,11),(213,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',201,1,NULL,12),(214,1,'CiviEvent Component Settings','CiviEvent Component Settings','civicrm/admin/setting/preferences/event?reset=1','access CiviEvent,administer CiviCRM','AND',201,1,NULL,13),(215,1,'CiviGrant','CiviGrant',NULL,'access CiviGrant,administer CiviCRM','AND',111,1,NULL,13),(216,1,'Grant Types','Grant Types','civicrm/admin/options/grant_type?reset=1','access CiviGrant,administer CiviCRM','AND',215,1,NULL,1),(217,1,'Grant Status','Grant Status','civicrm/admin/options/grant_status?reset=1','access CiviGrant,administer CiviCRM','AND',215,1,NULL,2),(218,1,'CiviMail','CiviMail',NULL,'access CiviMail,administer CiviCRM','AND',111,1,NULL,14),(219,1,'Headers, Footers, and Automated Messages','Headers, Footers, and Automated Messages','civicrm/admin/component?reset=1','access CiviMail,administer CiviCRM','AND',218,1,NULL,1),(220,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','administer CiviCRM','',218,1,NULL,2),(221,1,'From Email Addresses','From Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',218,1,NULL,3),(222,1,'Mail Accounts','Mail Accounts','civicrm/admin/mailSettings?reset=1','access CiviMail,administer CiviCRM','AND',218,1,NULL,4),(223,1,'Mailer Settings','Mailer Settings','civicrm/admin/mail?reset=1','access CiviMail,administer CiviCRM','AND',218,1,NULL,5),(224,1,'CiviMail Component Settings','CiviMail Component Settings','civicrm/admin/setting/preferences/mailing?reset=1','access CiviMail,administer CiviCRM','AND',218,1,NULL,6),(225,1,'CiviMember','CiviMember',NULL,'access CiviMember,administer CiviCRM','AND',111,1,NULL,15),(226,1,'Membership Types','Membership Types','civicrm/admin/member/membershipType?reset=1','access CiviMember,administer CiviCRM','AND',225,1,NULL,1),(227,1,'Membership Status Rules','Membership Status Rules','civicrm/admin/member/membershipStatus?reset=1','access CiviMember,administer CiviCRM','AND',225,1,1,2),(228,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviMember,administer CiviCRM','AND',225,1,NULL,3),(229,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviMember,administer CiviCRM','AND',225,1,NULL,4),(230,1,'CiviMember Component Settings','CiviMember Component Settings','civicrm/admin/setting/preferences/member?reset=1','access CiviMember,administer CiviCRM','AND',225,1,NULL,5),(231,1,'CiviReport','CiviReport',NULL,'access CiviReport,administer CiviCRM','AND',111,1,NULL,16),(232,1,'All Reports','All Reports','civicrm/report/list?reset=1','access CiviReport','',231,1,NULL,1),(233,1,'Create New Report from Template','Create New Report from Template','civicrm/admin/report/template/list?reset=1','administer Reports','',231,1,NULL,2),(234,1,'Manage Templates','Manage Templates','civicrm/admin/report/options/report_template?reset=1','administer Reports','',231,1,NULL,3),(235,1,'Register Report','Register Report','civicrm/admin/report/register?reset=1','administer Reports','',231,1,NULL,4),(236,1,'Support','Support',NULL,NULL,'',NULL,1,NULL,110),(237,1,'Get started','Get started','https://civicrm.org/get-started?src=iam',NULL,'AND',236,1,NULL,1),(238,1,'Documentation','Documentation','https://civicrm.org/documentation?src=iam',NULL,'AND',236,1,NULL,2),(239,1,'Ask a question','Ask a question','https://civicrm.org/ask-a-question?src=iam',NULL,'AND',236,1,NULL,3),(240,1,'Get expert help','Get expert help','https://civicrm.org/experts?src=iam',NULL,'AND',236,1,NULL,4),(241,1,'About CiviCRM','About CiviCRM','https://civicrm.org/about?src=iam',NULL,'AND',236,1,1,5),(242,1,'Register your site','Register your site','https://civicrm.org/register-your-site?src=iam&sid={sid}',NULL,'AND',236,1,NULL,6),(243,1,'Join CiviCRM','Join CiviCRM','https://civicrm.org/become-a-member?src=iam&sid={sid}',NULL,'AND',236,1,NULL,7),(244,1,'Developer','Developer',NULL,'administer CiviCRM','',236,1,1,8),(245,1,'API Explorer','API Explorer','civicrm/api','administer CiviCRM','',244,1,NULL,1),(246,1,'Developer Docs','Developer Docs','https://civicrm.org/developer-documentation?src=iam','administer CiviCRM','',244,1,NULL,3),(247,1,'Reports','Reports',NULL,'access CiviReport','',NULL,1,NULL,95),(248,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1','administer CiviCRM','',247,1,0,1),(249,1,'Contribution Reports','Contribution Reports','civicrm/report/list?compid=2&reset=1','access CiviContribute','',247,1,0,2),(250,1,'Pledge Reports','Pledge Reports','civicrm/report/list?compid=6&reset=1','access CiviPledge','',247,1,0,3),(251,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1','access CiviEvent','',247,1,0,4),(252,1,'Mailing Reports','Mailing Reports','civicrm/report/list?compid=4&reset=1','access CiviMail','',247,1,0,5),(253,1,'Membership Reports','Membership Reports','civicrm/report/list?compid=3&reset=1','access CiviMember','',247,1,0,6),(254,1,'Campaign Reports','Campaign Reports','civicrm/report/list?compid=9&reset=1','interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',247,1,0,7),(255,1,'Case Reports','Case Reports','civicrm/report/list?compid=7&reset=1','access my cases and activities,access all cases and activities,administer CiviCase','OR',247,1,0,8),(256,1,'Grant Reports','Grant Reports','civicrm/report/list?compid=5&reset=1','access CiviGrant','',247,1,0,9),(257,1,'All Reports','All Reports','civicrm/report/list?reset=1','access CiviReport','',247,1,1,10),(258,1,'My Reports','My Reports','civicrm/report/list?myreports=1&reset=1','access CiviReport','',247,1,1,11),(259,1,'New Student','New Student','civicrm/contact/add?ct=Individual&cst=Student&reset=1','add contacts','',16,1,NULL,1),(260,1,'New Parent','New Parent','civicrm/contact/add?ct=Individual&cst=Parent&reset=1','add contacts','',16,1,NULL,2),(261,1,'New Staff','New Staff','civicrm/contact/add?ct=Individual&cst=Staff&reset=1','add contacts','',16,1,NULL,3),(262,1,'New Team','New Team','civicrm/contact/add?ct=Organization&cst=Team&reset=1','add contacts','',18,1,NULL,1),(263,1,'New Sponsor','New Sponsor','civicrm/contact/add?ct=Organization&cst=Sponsor&reset=1','add contacts','',18,1,NULL,2);
+INSERT INTO `civicrm_navigation` (`id`, `domain_id`, `label`, `name`, `url`, `permission`, `permission_operator`, `parent_id`, `is_active`, `has_separator`, `weight`) VALUES (1,1,'Home','Home','civicrm/dashboard?reset=1',NULL,'',NULL,1,NULL,0),(2,1,'Search','Search...',NULL,NULL,'',NULL,1,NULL,10),(3,1,'Find Contacts','Find Contacts','civicrm/contact/search?reset=1',NULL,'',2,1,NULL,1),(4,1,'Advanced Search','Advanced Search','civicrm/contact/search/advanced?reset=1',NULL,'',2,1,NULL,2),(5,1,'Full-text Search','Full-text Search','civicrm/contact/search/custom?csid=15&reset=1',NULL,'',2,1,NULL,3),(6,1,'Search Builder','Search Builder','civicrm/contact/search/builder?reset=1',NULL,'',2,1,1,4),(7,1,'Find Cases','Find Cases','civicrm/case/search?reset=1','access my cases and activities,access all cases and activities','OR',2,1,NULL,5),(8,1,'Find Contributions','Find Contributions','civicrm/contribute/search?reset=1','access CiviContribute','',2,1,NULL,6),(9,1,'Find Mailings','Find Mailings','civicrm/mailing?reset=1','access CiviMail','',2,1,NULL,7),(10,1,'Find Memberships','Find Memberships','civicrm/member/search?reset=1','access CiviMember','',2,1,NULL,8),(11,1,'Find Participants','Find Participants','civicrm/event/search?reset=1','access CiviEvent','',2,1,NULL,9),(12,1,'Find Pledges','Find Pledges','civicrm/pledge/search?reset=1','access CiviPledge','',2,1,NULL,10),(13,1,'Find Activities','Find Activities','civicrm/activity/search?reset=1',NULL,'',2,1,1,11),(14,1,'Custom Searches','Custom Searches','civicrm/contact/search/custom/list?reset=1',NULL,'',2,1,NULL,12),(15,1,'Contacts','Contacts',NULL,NULL,'',NULL,1,NULL,20),(16,1,'New Individual','New Individual','civicrm/contact/add?reset=1&ct=Individual','add contacts','',15,1,NULL,1),(17,1,'New Household','New Household','civicrm/contact/add?reset=1&ct=Household','add contacts','',15,1,NULL,2),(18,1,'New Organization','New Organization','civicrm/contact/add?reset=1&ct=Organization','add contacts','',15,1,1,3),(19,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1','access CiviReport','',15,1,1,4),(20,1,'New Activity','New Activity','civicrm/activity?reset=1&action=add&context=standalone',NULL,'',15,1,NULL,5),(21,1,'New Email','New Email','civicrm/activity/email/add?atype=3&action=add&reset=1&context=standalone',NULL,'',15,1,1,6),(22,1,'Import Contacts','Import Contacts','civicrm/import/contact?reset=1','import contacts','',15,1,NULL,7),(23,1,'Import Activities','Import Activities','civicrm/import/activity?reset=1','import contacts','',15,1,1,8),(24,1,'New Group','New Group','civicrm/group/add?reset=1','edit groups','',15,1,NULL,9),(25,1,'Manage Groups','Manage Groups','civicrm/group?reset=1','access CiviCRM','',15,1,1,10),(26,1,'New Tag','New Tag','civicrm/tag?reset=1&action=add','manage tags','',15,1,NULL,11),(27,1,'Manage Tags (Categories)','Manage Tags (Categories)','civicrm/tag?reset=1','manage tags','',15,1,1,12),(28,1,'Find and Merge Duplicate Contacts','Find and Merge Duplicate Contacts','civicrm/contact/deduperules?reset=1','administer dedupe rules,merge duplicate contacts','OR',15,1,NULL,13),(29,1,'Contributions','Contributions',NULL,'access CiviContribute','',NULL,1,NULL,30),(30,1,'Dashboard','Dashboard','civicrm/contribute?reset=1','access CiviContribute','',29,1,NULL,1),(31,1,'New Contribution','New Contribution','civicrm/contribute/add?reset=1&action=add&context=standalone','access CiviContribute,edit contributions','AND',29,1,NULL,2),(32,1,'Find Contributions','Find Contributions','civicrm/contribute/search?reset=1','access CiviContribute','',29,1,NULL,3),(33,1,'Contribution Reports','Contribution Reports','civicrm/report/list?compid=2&reset=1','access CiviContribute','',29,1,1,4),(34,1,'Import Contributions','Import Contributions','civicrm/contribute/import?reset=1','access CiviContribute,edit contributions','AND',29,1,1,5),(35,1,'Batch Data Entry','Batch Data Entry','civicrm/batch?reset=1','access CiviContribute','',29,1,NULL,7),(36,1,'Pledges','Pledges',NULL,'access CiviPledge','',29,1,1,6),(37,1,'Accounting Batches','Accounting Batches',NULL,'view own manual batches,view all manual batches','OR',29,1,1,8),(38,1,'Dashboard','Dashboard','civicrm/pledge?reset=1','access CiviPledge','',36,1,NULL,1),(39,1,'New Pledge','New Pledge','civicrm/pledge/add?reset=1&action=add&context=standalone','access CiviPledge,edit pledges','AND',36,1,NULL,2),(40,1,'Find Pledges','Find Pledges','civicrm/pledge/search?reset=1','access CiviPledge','',36,1,NULL,3),(41,1,'Pledge Reports','Pledge Reports','civicrm/report/list?compid=6&reset=1','access CiviPledge','',36,1,0,4),(42,1,'New Contribution Page','New Contribution Page','civicrm/admin/contribute/add?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',29,1,NULL,9),(43,1,'Manage Contribution Pages','Manage Contribution Pages','civicrm/admin/contribute?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,10),(44,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=contribute','access CiviContribute,administer CiviCRM','AND',29,1,NULL,11),(45,1,'Premiums (Thank-you Gifts)','Premiums','civicrm/admin/contribute/managePremiums?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,12),(46,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',29,1,NULL,13),(47,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviContribute,administer CiviCRM','AND',29,1,1,14),(48,1,'New Batch','New Batch','civicrm/financial/batch?reset=1&action=add','create manual batch','AND',37,1,NULL,1),(49,1,'Open Batches','Open Batches','civicrm/financial/financialbatches?reset=1&batchStatus=1','view own manual batches,view all manual batches','OR',37,1,NULL,2),(50,1,'Closed Batches','Closed Batches','civicrm/financial/financialbatches?reset=1&batchStatus=2','view own manual batches,view all manual batches','OR',37,1,NULL,3),(51,1,'Exported Batches','Exported Batches','civicrm/financial/financialbatches?reset=1&batchStatus=5','view own manual batches,view all manual batches','OR',37,1,NULL,4),(52,1,'Events','Events',NULL,'access CiviEvent','',NULL,1,NULL,40),(53,1,'Dashboard','CiviEvent Dashboard','civicrm/event?reset=1','access CiviEvent','',52,1,NULL,1),(54,1,'Register Event Participant','Register Event Participant','civicrm/participant/add?reset=1&action=add&context=standalone','access CiviEvent,edit event participants','AND',52,1,NULL,2),(55,1,'Find Participants','Find Participants','civicrm/event/search?reset=1','access CiviEvent','',52,1,NULL,3),(56,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1','access CiviEvent','',52,1,1,4),(57,1,'Import Participants','Import Participants','civicrm/event/import?reset=1','access CiviEvent,edit event participants','AND',52,1,1,5),(58,1,'New Event','New Event','civicrm/event/add?reset=1&action=add','access CiviEvent,edit all events','AND',52,1,NULL,6),(59,1,'Manage Events','Manage Events','civicrm/event/manage?reset=1','access CiviEvent,edit all events','AND',52,1,1,7),(60,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=event','access CiviEvent,administer CiviCRM','AND',52,1,1,8),(61,1,'Event Templates','Event Templates','civicrm/admin/eventTemplate?reset=1','access CiviEvent,edit all events','AND',52,1,1,9),(62,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviEvent,edit all events','AND',52,1,NULL,10),(63,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviEvent,edit all events','AND',52,1,NULL,11),(64,1,'Mailings','Mailings',NULL,'access CiviMail,create mailings,approve mailings,schedule mailings','OR',NULL,1,NULL,50),(65,1,'New Mailing','New Mailing','civicrm/mailing/send?reset=1','access CiviMail,create mailings','OR',64,1,NULL,1),(66,1,'Draft and Unscheduled Mailings','Draft and Unscheduled Mailings','civicrm/mailing/browse/unscheduled?reset=1&scheduled=false','access CiviMail,create mailings,schedule mailings','OR',64,1,NULL,2),(67,1,'Scheduled and Sent Mailings','Scheduled and Sent Mailings','civicrm/mailing/browse/scheduled?reset=1&scheduled=true','access CiviMail,approve mailings,create mailings,schedule mailings','OR',64,1,NULL,3),(68,1,'Archived Mailings','Archived Mailings','civicrm/mailing/browse/archived?reset=1','access CiviMail,create mailings','OR',64,1,NULL,4),(69,1,'Mailing Reports','Mailing Reports','civicrm/report/list?compid=4&reset=1','access CiviMail','',64,1,1,5),(70,1,'Headers, Footers, and Automated Messages','Headers, Footers, and Automated Messages','civicrm/admin/component?reset=1','access CiviMail,administer CiviCRM','AND',64,1,NULL,6),(71,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','edit message templates','',64,1,NULL,7),(72,1,'From Email Addresses','From Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',64,1,1,8),(73,1,'New SMS','New SMS','civicrm/sms/send?reset=1','administer CiviCRM',NULL,64,1,NULL,9),(74,1,'Find Mass SMS','Find Mass SMS','civicrm/mailing/browse?reset=1&sms=1','administer CiviCRM',NULL,64,1,1,10),(75,1,'New A/B Test','New A/B Test','civicrm/a/#/abtest/new','access CiviMail','',64,1,NULL,15),(76,1,'Manage A/B Tests','Manage A/B Tests','civicrm/a/#/abtest','access CiviMail','',64,1,1,16),(77,1,'Memberships','Memberships',NULL,'access CiviMember','',NULL,1,NULL,60),(78,1,'Dashboard','Dashboard','civicrm/member?reset=1','access CiviMember','',77,1,NULL,1),(79,1,'New Membership','New Membership','civicrm/member/add?reset=1&action=add&context=standalone','access CiviMember,edit memberships','AND',77,1,NULL,2),(80,1,'Find Memberships','Find Memberships','civicrm/member/search?reset=1','access CiviMember','',77,1,NULL,3),(81,1,'Membership Reports','Membership Reports','civicrm/report/list?compid=3&reset=1','access CiviMember','',77,1,1,4),(82,1,'Batch Data Entry','Batch Data Entry','civicrm/batch?reset=1','access CiviContribute','',77,1,NULL,5),(83,1,'Import Memberships','Import Members','civicrm/member/import?reset=1','access CiviMember,edit memberships','AND',77,1,1,6),(84,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviMember,administer CiviCRM','AND',77,1,NULL,7),(85,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviMember,administer CiviCRM','AND',77,1,NULL,8),(86,1,'Campaigns','Campaigns',NULL,'interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',NULL,1,NULL,70),(87,1,'Dashboard','Dashboard','civicrm/campaign?reset=1','manage campaign,administer CiviCampaign','OR',86,1,NULL,1),(88,1,'Surveys','Survey Dashboard','civicrm/campaign?reset=1&subPage=survey','manage campaign,administer CiviCampaign','OR',87,1,NULL,1),(89,1,'Petitions','Petition Dashboard','civicrm/campaign?reset=1&subPage=petition','manage campaign,administer CiviCampaign','OR',87,1,NULL,2),(90,1,'Campaigns','Campaign Dashboard','civicrm/campaign?reset=1&subPage=campaign','manage campaign,administer CiviCampaign','OR',87,1,NULL,3),(91,1,'New Campaign','New Campaign','civicrm/campaign/add?reset=1','manage campaign,administer CiviCampaign','OR',86,1,NULL,2),(92,1,'New Survey','New Survey','civicrm/survey/add?reset=1','manage campaign,administer CiviCampaign','OR',86,1,NULL,3),(93,1,'New Petition','New Petition','civicrm/petition/add?reset=1','manage campaign,administer CiviCampaign','OR',86,1,NULL,4),(94,1,'Reserve Respondents','Reserve Respondents','civicrm/survey/search?reset=1&op=reserve','administer CiviCampaign,manage campaign,reserve campaign contacts','OR',86,1,NULL,5),(95,1,'Interview Respondents','Interview Respondents','civicrm/survey/search?reset=1&op=interview','administer CiviCampaign,manage campaign,interview campaign contacts','OR',86,1,NULL,6),(96,1,'Release Respondents','Release Respondents','civicrm/survey/search?reset=1&op=release','administer CiviCampaign,manage campaign,release campaign contacts','OR',86,1,NULL,7),(97,1,'Campaign Reports','Campaign Reports','civicrm/report/list?compid=9&reset=1','interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',86,1,1,8),(98,1,'Conduct Survey','Conduct Survey','civicrm/campaign/vote?reset=1','administer CiviCampaign,manage campaign,reserve campaign contacts,interview campaign contacts','OR',86,1,NULL,9),(99,1,'GOTV (Voter Tracking)','Voter Listing','civicrm/campaign/gotv?reset=1','administer CiviCampaign,manage campaign,release campaign contacts,gotv campaign contacts','OR',86,1,NULL,10),(100,1,'Cases','Cases',NULL,'access my cases and activities,access all cases and activities','OR',NULL,1,NULL,80),(101,1,'Dashboard','Dashboard','civicrm/case?reset=1','access my cases and activities,access all cases and activities','OR',100,1,NULL,1),(102,1,'New Case','New Case','civicrm/case/add?reset=1&action=add&atype=13&context=standalone','add cases,access all cases and activities','OR',100,1,NULL,2),(103,1,'Find Cases','Find Cases','civicrm/case/search?reset=1','access my cases and activities,access all cases and activities','OR',100,1,1,3),(104,1,'Case Reports','Case Reports','civicrm/report/list?compid=7&reset=1','access my cases and activities,access all cases and activities,administer CiviCase','OR',100,1,0,4),(105,1,'Grants','Grants',NULL,'access CiviGrant','',NULL,1,NULL,90),(106,1,'Dashboard','Dashboard','civicrm/grant?reset=1','access CiviGrant','',105,1,NULL,1),(107,1,'New Grant','New Grant','civicrm/grant/add?reset=1&action=add&context=standalone','access CiviGrant,edit grants','AND',105,1,NULL,2),(108,1,'Find Grants','Find Grants','civicrm/grant/search?reset=1','access CiviGrant','',105,1,1,3),(109,1,'Grant Reports','Grant Reports','civicrm/report/list?compid=5&reset=1','access CiviGrant','',105,1,0,4),(110,1,'Administer','Administer',NULL,'administer CiviCRM','',NULL,1,NULL,100),(111,1,'Administration Console','Administration Console','civicrm/admin?reset=1','administer CiviCRM','',110,1,NULL,1),(112,1,'System Status','System Status','civicrm/a/#/status','administer CiviCRM','',111,1,NULL,0),(113,1,'Configuration Checklist','Configuration Checklist','civicrm/admin/configtask?reset=1','administer CiviCRM','',111,1,NULL,1),(114,1,'Customize Data and Screens','Customize Data and Screens',NULL,'administer CiviCRM','',110,1,NULL,3),(115,1,'Custom Fields','Custom Fields','civicrm/admin/custom/group?reset=1','administer CiviCRM','',114,1,NULL,1),(116,1,'Profiles','Profiles','civicrm/admin/uf/group?reset=1','administer CiviCRM','',114,1,NULL,2),(117,1,'Tags (Categories)','Tags (Categories)','civicrm/tag?reset=1','administer CiviCRM','',114,1,NULL,3),(118,1,'Activity Types','Activity Types','civicrm/admin/options/activity_type?reset=1','administer CiviCRM','',114,1,NULL,4),(119,1,'Relationship Types','Relationship Types','civicrm/admin/reltype?reset=1','administer CiviCRM','',114,1,NULL,5),(120,1,'Contact Types','Contact Types','civicrm/admin/options/subtype?reset=1','administer CiviCRM','',114,1,NULL,6),(121,1,'Display Preferences','Display Preferences','civicrm/admin/setting/preferences/display?reset=1','administer CiviCRM','',114,1,NULL,9),(122,1,'Search Preferences','Search Preferences','civicrm/admin/setting/search?reset=1','administer CiviCRM','',114,1,NULL,10),(123,1,'Date Preferences','Date Preferences','civicrm/admin/setting/preferences/date?reset=1','administer CiviCRM','',114,1,NULL,11),(124,1,'Navigation Menu','Navigation Menu','civicrm/admin/menu?reset=1','administer CiviCRM','',114,1,NULL,12),(125,1,'Word Replacements','Word Replacements','civicrm/admin/options/wordreplacements?reset=1','administer CiviCRM','',114,1,NULL,13),(126,1,'Manage Custom Searches','Manage Custom Searches','civicrm/admin/options/custom_search?reset=1','administer CiviCRM','',114,1,NULL,14),(127,1,'Dropdown Options','Dropdown Options',NULL,'administer CiviCRM','',114,1,NULL,8),(128,1,'Gender Options','Gender Options','civicrm/admin/options/gender?reset=1','administer CiviCRM','',127,1,NULL,1),(129,1,'Individual Prefixes (Ms, Mr...)','Individual Prefixes (Ms, Mr...)','civicrm/admin/options/individual_prefix?reset=1','administer CiviCRM','',127,1,NULL,2),(130,1,'Individual Suffixes (Jr, Sr...)','Individual Suffixes (Jr, Sr...)','civicrm/admin/options/individual_suffix?reset=1','administer CiviCRM','',127,1,NULL,3),(131,1,'Instant Messenger Services','Instant Messenger Services','civicrm/admin/options/instant_messenger_service?reset=1','administer CiviCRM','',127,1,NULL,4),(132,1,'Location Types (Home, Work...)','Location Types (Home, Work...)','civicrm/admin/locationType?reset=1','administer CiviCRM','',127,1,NULL,5),(133,1,'Mobile Phone Providers','Mobile Phone Providers','civicrm/admin/options/mobile_provider?reset=1','administer CiviCRM','',127,1,NULL,6),(134,1,'Phone Types','Phone Types','civicrm/admin/options/phone_type?reset=1','administer CiviCRM','',127,1,NULL,7),(135,1,'Website Types','Website Types','civicrm/admin/options/website_type?reset=1','administer CiviCRM','',127,1,NULL,8),(136,1,'Communications','Communications',NULL,'administer CiviCRM','',110,1,NULL,4),(137,1,'Organization Address and Contact Info','Organization Address and Contact Info','civicrm/admin/domain?action=update&reset=1','administer CiviCRM','',136,1,NULL,1),(138,1,'FROM Email Addresses','FROM Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',136,1,NULL,2),(139,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','administer CiviCRM','',136,1,NULL,3),(140,1,'Schedule Reminders','Schedule Reminders','civicrm/admin/scheduleReminders?reset=1','administer CiviCRM','',136,1,NULL,4),(141,1,'Preferred Communication Methods','Preferred Communication Methods','civicrm/admin/options/preferred_communication_method?reset=1','administer CiviCRM','',136,1,NULL,5),(142,1,'Label Formats','Label Formats','civicrm/admin/labelFormats?reset=1','administer CiviCRM','',136,1,NULL,6),(143,1,'Print Page (PDF) Formats','Print Page (PDF) Formats','civicrm/admin/pdfFormats?reset=1','administer CiviCRM','',136,1,NULL,7),(144,1,'Communication Style Options','Communication Style Options','civicrm/admin/options/communication_style?reset=1','administer CiviCRM','',136,1,NULL,8),(145,1,'Email Greeting Formats','Email Greeting Formats','civicrm/admin/options/email_greeting?reset=1','administer CiviCRM','',136,1,NULL,9),(146,1,'Postal Greeting Formats','Postal Greeting Formats','civicrm/admin/options/postal_greeting?reset=1','administer CiviCRM','',136,1,NULL,10),(147,1,'Addressee Formats','Addressee Formats','civicrm/admin/options/addressee?reset=1','administer CiviCRM','',136,1,NULL,11),(148,1,'Localization','Localization',NULL,'administer CiviCRM','',110,1,NULL,6),(149,1,'Languages, Currency, Locations','Languages, Currency, Locations','civicrm/admin/setting/localization?reset=1','administer CiviCRM','',148,1,NULL,1),(150,1,'Address Settings','Address Settings','civicrm/admin/setting/preferences/address?reset=1','administer CiviCRM','',148,1,NULL,2),(151,1,'Date Formats','Date Formats','civicrm/admin/setting/date?reset=1','administer CiviCRM','',148,1,NULL,3),(152,1,'Preferred Language Options','Preferred Language Options','civicrm/admin/options/languages?reset=1','administer CiviCRM','',148,1,NULL,4),(153,1,'Users and Permissions','Users and Permissions',NULL,'administer CiviCRM','',110,1,NULL,7),(154,1,'Permissions (Access Control)','Permissions (Access Control)','civicrm/admin/access?reset=1','administer CiviCRM','',153,1,NULL,1),(155,1,'Synchronize Users to Contacts','Synchronize Users to Contacts','civicrm/admin/synchUser?reset=1','administer CiviCRM','',153,1,NULL,2),(156,1,'System Settings','System Settings',NULL,'administer CiviCRM','',110,1,NULL,8),(157,1,'Components','Enable Components','civicrm/admin/setting/component?reset=1','administer CiviCRM','',156,1,NULL,1),(158,1,'Connections','Connections','civicrm/a/#/cxn','administer CiviCRM','',156,1,NULL,2),(159,1,'Extensions','Manage Extensions','civicrm/admin/extensions?reset=1','administer CiviCRM','',156,1,1,3),(160,1,'Cleanup Caches and Update Paths','Cleanup Caches and Update Paths','civicrm/admin/setting/updateConfigBackend?reset=1','administer CiviCRM','',156,1,NULL,4),(161,1,'CMS Database Integration','CMS Integration','civicrm/admin/setting/uf?reset=1','administer CiviCRM','',156,1,NULL,5),(162,1,'Debugging and Error Handling','Debugging and Error Handling','civicrm/admin/setting/debug?reset=1','administer CiviCRM','',156,1,NULL,6),(163,1,'Directories','Directories','civicrm/admin/setting/path?reset=1','administer CiviCRM','',156,1,NULL,7),(164,1,'Import/Export Mappings','Import/Export Mappings','civicrm/admin/mapping?reset=1','administer CiviCRM','',156,1,NULL,8),(165,1,'Mapping and Geocoding','Mapping and Geocoding','civicrm/admin/setting/mapping?reset=1','administer CiviCRM','',156,1,NULL,9),(166,1,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','civicrm/admin/setting/misc?reset=1','administer CiviCRM','',156,1,NULL,10),(167,1,'Multi Site Settings','Multi Site Settings','civicrm/admin/setting/preferences/multisite?reset=1','administer CiviCRM','',156,1,NULL,11),(168,1,'Option Groups','Option Groups','civicrm/admin/options?reset=1','administer CiviCRM','',156,1,NULL,12),(169,1,'Outbound Email (SMTP/Sendmail)','Outbound Email','civicrm/admin/setting/smtp?reset=1','administer CiviCRM','',156,1,NULL,13),(170,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',156,1,NULL,14),(171,1,'Resource URLs','Resource URLs','civicrm/admin/setting/url?reset=1','administer CiviCRM','',156,1,NULL,15),(172,1,'Safe File Extensions','Safe File Extensions','civicrm/admin/options/safe_file_extension?reset=1','administer CiviCRM','',156,1,NULL,16),(173,1,'Scheduled Jobs','Scheduled Jobs','civicrm/admin/job?reset=1','administer CiviCRM','',156,1,NULL,17),(174,1,'SMS Providers','SMS Providers','civicrm/admin/sms/provider?reset=1','administer CiviCRM','',156,1,NULL,18),(175,1,'CiviCampaign','CiviCampaign',NULL,'administer CiviCampaign,administer CiviCRM','AND',110,1,NULL,9),(176,1,'Survey Types','Survey Types','civicrm/admin/campaign/surveyType?reset=1','administer CiviCampaign','',175,1,NULL,1),(177,1,'Campaign Types','Campaign Types','civicrm/admin/options/campaign_type?reset=1','administer CiviCampaign','',175,1,NULL,2),(178,1,'Campaign Status','Campaign Status','civicrm/admin/options/campaign_status?reset=1','administer CiviCampaign','',175,1,NULL,3),(179,1,'Engagement Index','Engagement Index','civicrm/admin/options/engagement_index?reset=1','administer CiviCampaign','',175,1,NULL,4),(180,1,'CiviCampaign Component Settings','CiviCampaign Component Settings','civicrm/admin/setting/preferences/campaign?reset=1','administer CiviCampaign','',175,1,NULL,5),(181,1,'CiviCase','CiviCase',NULL,'administer CiviCase',NULL,110,1,NULL,10),(182,1,'Case Types','Case Types','civicrm/a/#/caseType','administer CiviCase',NULL,181,1,NULL,1),(183,1,'Redaction Rules','Redaction Rules','civicrm/admin/options/redaction_rule?reset=1','administer CiviCase',NULL,181,1,NULL,2),(184,1,'Case Statuses','Case Statuses','civicrm/admin/options/case_status?reset=1','administer CiviCase',NULL,181,1,NULL,3),(185,1,'Encounter Medium','Encounter Medium','civicrm/admin/options/encounter_medium?reset=1','administer CiviCase',NULL,181,1,NULL,4),(186,1,'CiviContribute','CiviContribute',NULL,'access CiviContribute,administer CiviCRM','AND',110,1,NULL,11),(187,1,'New Contribution Page','New Contribution Page','civicrm/admin/contribute?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',186,1,NULL,6),(188,1,'Manage Contribution Pages','Manage Contribution Pages','civicrm/admin/contribute?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,1,7),(189,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=contribute','access CiviContribute,administer CiviCRM','AND',186,1,NULL,8),(190,1,'Premiums (Thank-you Gifts)','Premiums','civicrm/admin/contribute/managePremiums?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,1,9),(191,1,'Financial Types','Financial Types','civicrm/admin/financial/financialType?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,NULL,10),(192,1,'Financial Accounts','Financial Accounts','civicrm/admin/financial/financialAccount?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,NULL,11),(193,1,'Payment Methods','Payment Instruments','civicrm/admin/options/payment_instrument?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,NULL,12),(194,1,'Accepted Credit Cards','Accepted Credit Cards','civicrm/admin/options/accept_creditcard?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,NULL,13),(195,1,'Soft Credit Types','Soft Credit Types','civicrm/admin/options/soft_credit_type?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,1,14),(196,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviContribute,administer CiviCRM','AND',186,1,NULL,15),(197,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviContribute,administer CiviCRM','AND',186,1,NULL,16),(198,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',186,1,NULL,17),(199,1,'CiviContribute Component Settings','CiviContribute Component Settings','civicrm/admin/setting/preferences/contribute?reset=1','administer CiviCRM','',186,1,NULL,18),(200,1,'CiviEvent','CiviEvent',NULL,'access CiviEvent,administer CiviCRM','AND',110,1,NULL,12),(201,1,'New Event','New Event','civicrm/event/add?reset=1&action=add','access CiviEvent,administer CiviCRM','AND',200,1,NULL,1),(202,1,'Manage Events','Manage Events','civicrm/event/manage?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,1,2),(203,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=event','access CiviEvent,administer CiviCRM','AND',200,1,1,3),(204,1,'Event Templates','Event Templates','civicrm/admin/eventTemplate?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,1,4),(205,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviEvent,administer CiviCRM','AND',200,1,NULL,5),(206,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,1,6),(207,1,'Event Types','Event Types','civicrm/admin/options/event_type?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,7),(208,1,'Participant Statuses','Participant Statuses','civicrm/admin/participant_status?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,8),(209,1,'Participant Roles','Participant Roles','civicrm/admin/options/participant_role?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,9),(210,1,'Participant Listing Options','Participant Listing Options','civicrm/admin/options/participant_listing?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,10),(211,1,'Event Name Badge Layouts','Event Name Badge Layouts','civicrm/admin/badgelayout?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,11),(212,1,'Payment Processors','Payment Processors','civicrm/admin/paymentProcessor?reset=1','administer CiviCRM','',200,1,NULL,12),(213,1,'CiviEvent Component Settings','CiviEvent Component Settings','civicrm/admin/setting/preferences/event?reset=1','access CiviEvent,administer CiviCRM','AND',200,1,NULL,13),(214,1,'CiviGrant','CiviGrant',NULL,'access CiviGrant,administer CiviCRM','AND',110,1,NULL,13),(215,1,'Grant Types','Grant Types','civicrm/admin/options/grant_type?reset=1','access CiviGrant,administer CiviCRM','AND',214,1,NULL,1),(216,1,'Grant Status','Grant Status','civicrm/admin/options/grant_status?reset=1','access CiviGrant,administer CiviCRM','AND',214,1,NULL,2),(217,1,'CiviMail','CiviMail',NULL,'access CiviMail,administer CiviCRM','AND',110,1,NULL,14),(218,1,'Headers, Footers, and Automated Messages','Headers, Footers, and Automated Messages','civicrm/admin/component?reset=1','access CiviMail,administer CiviCRM','AND',217,1,NULL,1),(219,1,'Message Templates','Message Templates','civicrm/admin/messageTemplates?reset=1','administer CiviCRM','',217,1,NULL,2),(220,1,'From Email Addresses','From Email Addresses','civicrm/admin/options/from_email_address?reset=1','administer CiviCRM','',217,1,NULL,3),(221,1,'Mail Accounts','Mail Accounts','civicrm/admin/mailSettings?reset=1','access CiviMail,administer CiviCRM','AND',217,1,NULL,4),(222,1,'Mailer Settings','Mailer Settings','civicrm/admin/mail?reset=1','access CiviMail,administer CiviCRM','AND',217,1,NULL,5),(223,1,'CiviMail Component Settings','CiviMail Component Settings','civicrm/admin/setting/preferences/mailing?reset=1','access CiviMail,administer CiviCRM','AND',217,1,NULL,6),(224,1,'CiviMember','CiviMember',NULL,'access CiviMember,administer CiviCRM','AND',110,1,NULL,15),(225,1,'Membership Types','Membership Types','civicrm/admin/member/membershipType?reset=1','access CiviMember,administer CiviCRM','AND',224,1,NULL,1),(226,1,'Membership Status Rules','Membership Status Rules','civicrm/admin/member/membershipStatus?reset=1','access CiviMember,administer CiviCRM','AND',224,1,1,2),(227,1,'New Price Set','New Price Set','civicrm/admin/price?reset=1&action=add','access CiviMember,administer CiviCRM','AND',224,1,NULL,3),(228,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1','access CiviMember,administer CiviCRM','AND',224,1,NULL,4),(229,1,'CiviMember Component Settings','CiviMember Component Settings','civicrm/admin/setting/preferences/member?reset=1','access CiviMember,administer CiviCRM','AND',224,1,NULL,5),(230,1,'CiviReport','CiviReport',NULL,'access CiviReport,administer CiviCRM','AND',110,1,NULL,16),(231,1,'All Reports','All Reports','civicrm/report/list?reset=1','access CiviReport','',230,1,NULL,1),(232,1,'Create New Report from Template','Create New Report from Template','civicrm/admin/report/template/list?reset=1','administer Reports','',230,1,NULL,2),(233,1,'Manage Templates','Manage Templates','civicrm/admin/report/options/report_template?reset=1','administer Reports','',230,1,NULL,3),(234,1,'Register Report','Register Report','civicrm/admin/report/register?reset=1','administer Reports','',230,1,NULL,4),(235,1,'Support','Support',NULL,NULL,'',NULL,1,NULL,110),(236,1,'Get started','Get started','https://civicrm.org/get-started?src=iam',NULL,'AND',235,1,NULL,1),(237,1,'Documentation','Documentation','https://civicrm.org/documentation?src=iam',NULL,'AND',235,1,NULL,2),(238,1,'Ask a question','Ask a question','https://civicrm.org/ask-a-question?src=iam',NULL,'AND',235,1,NULL,3),(239,1,'Get expert help','Get expert help','https://civicrm.org/experts?src=iam',NULL,'AND',235,1,NULL,4),(240,1,'About CiviCRM','About CiviCRM','https://civicrm.org/about?src=iam',NULL,'AND',235,1,1,5),(241,1,'Register your site','Register your site','https://civicrm.org/register-your-site?src=iam&sid={sid}',NULL,'AND',235,1,NULL,6),(242,1,'Join CiviCRM','Join CiviCRM','https://civicrm.org/become-a-member?src=iam&sid={sid}',NULL,'AND',235,1,NULL,7),(243,1,'Developer','Developer',NULL,'administer CiviCRM','',235,1,1,8),(244,1,'API Explorer','API Explorer','civicrm/api','administer CiviCRM','',243,1,NULL,1),(245,1,'Developer Docs','Developer Docs','https://civicrm.org/developer-documentation?src=iam','administer CiviCRM','',243,1,NULL,3),(246,1,'Reports','Reports',NULL,'access CiviReport','',NULL,1,NULL,95),(247,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1','administer CiviCRM','',246,1,0,1),(248,1,'Contribution Reports','Contribution Reports','civicrm/report/list?compid=2&reset=1','access CiviContribute','',246,1,0,2),(249,1,'Pledge Reports','Pledge Reports','civicrm/report/list?compid=6&reset=1','access CiviPledge','',246,1,0,3),(250,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1','access CiviEvent','',246,1,0,4),(251,1,'Mailing Reports','Mailing Reports','civicrm/report/list?compid=4&reset=1','access CiviMail','',246,1,0,5),(252,1,'Membership Reports','Membership Reports','civicrm/report/list?compid=3&reset=1','access CiviMember','',246,1,0,6),(253,1,'Campaign Reports','Campaign Reports','civicrm/report/list?compid=9&reset=1','interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',246,1,0,7),(254,1,'Case Reports','Case Reports','civicrm/report/list?compid=7&reset=1','access my cases and activities,access all cases and activities,administer CiviCase','OR',246,1,0,8),(255,1,'Grant Reports','Grant Reports','civicrm/report/list?compid=5&reset=1','access CiviGrant','',246,1,0,9),(256,1,'All Reports','All Reports','civicrm/report/list?reset=1','access CiviReport','',246,1,1,10),(257,1,'My Reports','My Reports','civicrm/report/list?myreports=1&reset=1','access CiviReport','',246,1,1,11),(258,1,'New Student','New Student','civicrm/contact/add?ct=Individual&cst=Student&reset=1','add contacts','',16,1,NULL,1),(259,1,'New Parent','New Parent','civicrm/contact/add?ct=Individual&cst=Parent&reset=1','add contacts','',16,1,NULL,2),(260,1,'New Staff','New Staff','civicrm/contact/add?ct=Individual&cst=Staff&reset=1','add contacts','',16,1,NULL,3),(261,1,'New Team','New Team','civicrm/contact/add?ct=Organization&cst=Team&reset=1','add contacts','',18,1,NULL,1),(262,1,'New Sponsor','New Sponsor','civicrm/contact/add?ct=Organization&cst=Sponsor&reset=1','add contacts','',18,1,NULL,2);
/*!40000 ALTER TABLE `civicrm_navigation` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1326,7 +1326,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_state_province` WRITE;
/*!40000 ALTER TABLE `civicrm_state_province` DISABLE KEYS */;
-INSERT INTO `civicrm_state_province` (`id`, `name`, `abbreviation`, `country_id`) VALUES (1000,'Alabama','AL',1228),(1001,'Alaska','AK',1228),(1002,'Arizona','AZ',1228),(1003,'Arkansas','AR',1228),(1004,'California','CA',1228),(1005,'Colorado','CO',1228),(1006,'Connecticut','CT',1228),(1007,'Delaware','DE',1228),(1008,'Florida','FL',1228),(1009,'Georgia','GA',1228),(1010,'Hawaii','HI',1228),(1011,'Idaho','ID',1228),(1012,'Illinois','IL',1228),(1013,'Indiana','IN',1228),(1014,'Iowa','IA',1228),(1015,'Kansas','KS',1228),(1016,'Kentucky','KY',1228),(1017,'Louisiana','LA',1228),(1018,'Maine','ME',1228),(1019,'Maryland','MD',1228),(1020,'Massachusetts','MA',1228),(1021,'Michigan','MI',1228),(1022,'Minnesota','MN',1228),(1023,'Mississippi','MS',1228),(1024,'Missouri','MO',1228),(1025,'Montana','MT',1228),(1026,'Nebraska','NE',1228),(1027,'Nevada','NV',1228),(1028,'New Hampshire','NH',1228),(1029,'New Jersey','NJ',1228),(1030,'New Mexico','NM',1228),(1031,'New York','NY',1228),(1032,'North Carolina','NC',1228),(1033,'North Dakota','ND',1228),(1034,'Ohio','OH',1228),(1035,'Oklahoma','OK',1228),(1036,'Oregon','OR',1228),(1037,'Pennsylvania','PA',1228),(1038,'Rhode Island','RI',1228),(1039,'South Carolina','SC',1228),(1040,'South Dakota','SD',1228),(1041,'Tennessee','TN',1228),(1042,'Texas','TX',1228),(1043,'Utah','UT',1228),(1044,'Vermont','VT',1228),(1045,'Virginia','VA',1228),(1046,'Washington','WA',1228),(1047,'West Virginia','WV',1228),(1048,'Wisconsin','WI',1228),(1049,'Wyoming','WY',1228),(1050,'District of Columbia','DC',1228),(1052,'American Samoa','AS',1228),(1053,'Guam','GU',1228),(1055,'Northern Mariana Islands','MP',1228),(1056,'Puerto Rico','PR',1228),(1057,'Virgin Islands','VI',1228),(1058,'United States Minor Outlying Islands','UM',1228),(1059,'Armed Forces Europe','AE',1228),(1060,'Armed Forces Americas','AA',1228),(1061,'Armed Forces Pacific','AP',1228),(1100,'Alberta','AB',1039),(1101,'British Columbia','BC',1039),(1102,'Manitoba','MB',1039),(1103,'New Brunswick','NB',1039),(1104,'Newfoundland and Labrador','NL',1039),(1105,'Northwest Territories','NT',1039),(1106,'Nova Scotia','NS',1039),(1107,'Nunavut','NU',1039),(1108,'Ontario','ON',1039),(1109,'Prince Edward Island','PE',1039),(1110,'Quebec','QC',1039),(1111,'Saskatchewan','SK',1039),(1112,'Yukon Territory','YT',1039),(1200,'Maharashtra','MM',1101),(1201,'Karnataka','KA',1101),(1202,'Andhra Pradesh','AP',1101),(1203,'Arunachal Pradesh','AR',1101),(1204,'Assam','AS',1101),(1205,'Bihar','BR',1101),(1206,'Chhattisgarh','CH',1101),(1207,'Goa','GA',1101),(1208,'Gujarat','GJ',1101),(1209,'Haryana','HR',1101),(1210,'Himachal Pradesh','HP',1101),(1211,'Jammu and Kashmir','JK',1101),(1212,'Jharkhand','JH',1101),(1213,'Kerala','KL',1101),(1214,'Madhya Pradesh','MP',1101),(1215,'Manipur','MN',1101),(1216,'Meghalaya','ML',1101),(1217,'Mizoram','MZ',1101),(1218,'Nagaland','NL',1101),(1219,'Orissa','OR',1101),(1220,'Punjab','PB',1101),(1221,'Rajasthan','RJ',1101),(1222,'Sikkim','SK',1101),(1223,'Tamil Nadu','TN',1101),(1224,'Tripura','TR',1101),(1225,'Uttaranchal','UL',1101),(1226,'Uttar Pradesh','UP',1101),(1227,'West Bengal','WB',1101),(1228,'Andaman and Nicobar Islands','AN',1101),(1229,'Dadra and Nagar Haveli','DN',1101),(1230,'Daman and Diu','DD',1101),(1231,'Delhi','DL',1101),(1232,'Lakshadweep','LD',1101),(1233,'Pondicherry','PY',1101),(1300,'mazowieckie','MZ',1172),(1301,'pomorskie','PM',1172),(1302,'dolnoÅ›lÄ…skie','DS',1172),(1303,'kujawsko-pomorskie','KP',1172),(1304,'lubelskie','LU',1172),(1305,'lubuskie','LB',1172),(1306,'łódzkie','LD',1172),(1307,'maÅ‚opolskie','MA',1172),(1308,'opolskie','OP',1172),(1309,'podkarpackie','PK',1172),(1310,'podlaskie','PD',1172),(1311,'Å›lÄ…skie','SL',1172),(1312,'Å›wiÄ™tokrzyskie','SK',1172),(1313,'warmiÅ„sko-mazurskie','WN',1172),(1314,'wielkopolskie','WP',1172),(1315,'zachodniopomorskie','ZP',1172),(1500,'Abu Zaby','AZ',1225),(1501,'\'Ajman','AJ',1225),(1502,'Al Fujayrah','FU',1225),(1503,'Ash Shariqah','SH',1225),(1504,'Dubayy','DU',1225),(1505,'Ra\'s al Khaymah','RK',1225),(1506,'Dac Lac','33',1233),(1507,'Umm al Qaywayn','UQ',1225),(1508,'Badakhshan','BDS',1001),(1509,'Badghis','BDG',1001),(1510,'Baghlan','BGL',1001),(1511,'Balkh','BAL',1001),(1512,'Bamian','BAM',1001),(1513,'Farah','FRA',1001),(1514,'Faryab','FYB',1001),(1515,'Ghazni','GHA',1001),(1516,'Ghowr','GHO',1001),(1517,'Helmand','HEL',1001),(1518,'Herat','HER',1001),(1519,'Jowzjan','JOW',1001),(1520,'Kabul','KAB',1001),(1521,'Kandahar','KAN',1001),(1522,'Kapisa','KAP',1001),(1523,'Khowst','KHO',1001),(1524,'Konar','KNR',1001),(1525,'Kondoz','KDZ',1001),(1526,'Laghman','LAG',1001),(1527,'Lowgar','LOW',1001),(1528,'Nangrahar','NAN',1001),(1529,'Nimruz','NIM',1001),(1530,'Nurestan','NUR',1001),(1531,'Oruzgan','ORU',1001),(1532,'Paktia','PIA',1001),(1533,'Paktika','PKA',1001),(1534,'Parwan','PAR',1001),(1535,'Samangan','SAM',1001),(1536,'Sar-e Pol','SAR',1001),(1537,'Takhar','TAK',1001),(1538,'Wardak','WAR',1001),(1539,'Zabol','ZAB',1001),(1540,'Berat','BR',1002),(1541,'Bulqizë','BU',1002),(1542,'Delvinë','DL',1002),(1543,'Devoll','DV',1002),(1544,'Dibër','DI',1002),(1545,'Durrës','DR',1002),(1546,'Elbasan','EL',1002),(1547,'Fier','FR',1002),(1548,'Gramsh','GR',1002),(1549,'Gjirokastër','GJ',1002),(1550,'Has','HA',1002),(1551,'Kavajë','KA',1002),(1552,'Kolonjë','ER',1002),(1553,'Korçë','KO',1002),(1554,'Krujë','KR',1002),(1555,'Kuçovë','KC',1002),(1556,'Kukës','KU',1002),(1557,'Kurbin','KB',1002),(1558,'Lezhë','LE',1002),(1559,'Librazhd','LB',1002),(1560,'Lushnjë','LU',1002),(1561,'Malësi e Madhe','MM',1002),(1562,'Mallakastër','MK',1002),(1563,'Mat','MT',1002),(1564,'Mirditë','MR',1002),(1565,'Peqin','PQ',1002),(1566,'Përmet','PR',1002),(1567,'Pogradec','PG',1002),(1568,'Pukë','PU',1002),(1569,'Sarandë','SR',1002),(1570,'Skrapar','SK',1002),(1571,'Shkodër','SH',1002),(1572,'Tepelenë','TE',1002),(1573,'Tiranë','TR',1002),(1574,'Tropojë','TP',1002),(1575,'Vlorë','VL',1002),(1576,'Erevan','ER',1011),(1577,'Aragacotn','AG',1011),(1578,'Ararat','AR',1011),(1579,'Armavir','AV',1011),(1580,'Gegarkunik\'','GR',1011),(1581,'Kotayk\'','KT',1011),(1582,'Lory','LO',1011),(1583,'Sirak','SH',1011),(1584,'Syunik\'','SU',1011),(1585,'Tavus','TV',1011),(1586,'Vayoc Jor','VD',1011),(1587,'Bengo','BGO',1006),(1588,'Benguela','BGU',1006),(1589,'Bie','BIE',1006),(1590,'Cabinda','CAB',1006),(1591,'Cuando-Cubango','CCU',1006),(1592,'Cuanza Norte','CNO',1006),(1593,'Cuanza Sul','CUS',1006),(1594,'Cunene','CNN',1006),(1595,'Huambo','HUA',1006),(1596,'Huila','HUI',1006),(1597,'Luanda','LUA',1006),(1598,'Lunda Norte','LNO',1006),(1599,'Lunda Sul','LSU',1006),(1600,'Malange','MAL',1006),(1601,'Moxico','MOX',1006),(1602,'Namibe','NAM',1006),(1603,'Uige','UIG',1006),(1604,'Zaire','ZAI',1006),(1605,'Capital federal','C',1010),(1606,'Buenos Aires','B',1010),(1607,'Catamarca','K',1010),(1608,'Cordoba','X',1010),(1609,'Corrientes','W',1010),(1610,'Chaco','H',1010),(1611,'Chubut','U',1010),(1612,'Entre Rios','E',1010),(1613,'Formosa','P',1010),(1614,'Jujuy','Y',1010),(1615,'La Pampa','L',1010),(1616,'Mendoza','M',1010),(1617,'Misiones','N',1010),(1618,'Neuquen','Q',1010),(1619,'Rio Negro','R',1010),(1620,'Salta','A',1010),(1621,'San Juan','J',1010),(1622,'San Luis','D',1010),(1623,'Santa Cruz','Z',1010),(1624,'Santa Fe','S',1010),(1625,'Santiago del Estero','G',1010),(1626,'Tierra del Fuego','V',1010),(1627,'Tucuman','T',1010),(1628,'Burgenland','1',1014),(1629,'Kärnten','2',1014),(1630,'Niederosterreich','3',1014),(1631,'Oberosterreich','4',1014),(1632,'Salzburg','5',1014),(1633,'Steiermark','6',1014),(1634,'Tirol','7',1014),(1635,'Vorarlberg','8',1014),(1636,'Wien','9',1014),(1637,'Australian Antarctic Territory','AAT',1008),(1638,'Australian Capital Territory','ACT',1013),(1639,'Northern Territory','NT',1013),(1640,'New South Wales','NSW',1013),(1641,'Queensland','QLD',1013),(1642,'South Australia','SA',1013),(1643,'Tasmania','TAS',1013),(1644,'Victoria','VIC',1013),(1645,'Western Australia','WA',1013),(1646,'Naxcivan','NX',1015),(1647,'Ali Bayramli','AB',1015),(1648,'Baki','BA',1015),(1649,'Ganca','GA',1015),(1650,'Lankaran','LA',1015),(1651,'Mingacevir','MI',1015),(1652,'Naftalan','NA',1015),(1653,'Saki','SA',1015),(1654,'Sumqayit','SM',1015),(1655,'Susa','SS',1015),(1656,'Xankandi','XA',1015),(1657,'Yevlax','YE',1015),(1658,'Abseron','ABS',1015),(1659,'Agcabadi','AGC',1015),(1660,'Agdam','AGM',1015),(1661,'Agdas','AGS',1015),(1662,'Agstafa','AGA',1015),(1663,'Agsu','AGU',1015),(1664,'Astara','AST',1015),(1665,'Babak','BAB',1015),(1666,'Balakan','BAL',1015),(1667,'Barda','BAR',1015),(1668,'Beylagan','BEY',1015),(1669,'Bilasuvar','BIL',1015),(1670,'Cabrayll','CAB',1015),(1671,'Calilabad','CAL',1015),(1672,'Culfa','CUL',1015),(1673,'Daskasan','DAS',1015),(1674,'Davaci','DAV',1015),(1675,'Fuzuli','FUZ',1015),(1676,'Gadabay','GAD',1015),(1677,'Goranboy','GOR',1015),(1678,'Goycay','GOY',1015),(1679,'Haciqabul','HAC',1015),(1680,'Imisli','IMI',1015),(1681,'Ismayilli','ISM',1015),(1682,'Kalbacar','KAL',1015),(1683,'Kurdamir','KUR',1015),(1684,'Lacin','LAC',1015),(1685,'Lerik','LER',1015),(1686,'Masalli','MAS',1015),(1687,'Neftcala','NEF',1015),(1688,'Oguz','OGU',1015),(1689,'Ordubad','ORD',1015),(1690,'Qabala','QAB',1015),(1691,'Qax','QAX',1015),(1692,'Qazax','QAZ',1015),(1693,'Qobustan','QOB',1015),(1694,'Quba','QBA',1015),(1695,'Qubadli','QBI',1015),(1696,'Qusar','QUS',1015),(1697,'Saatli','SAT',1015),(1698,'Sabirabad','SAB',1015),(1699,'Sadarak','SAD',1015),(1700,'Sahbuz','SAH',1015),(1701,'Salyan','SAL',1015),(1702,'Samaxi','SMI',1015),(1703,'Samkir','SKR',1015),(1704,'Samux','SMX',1015),(1705,'Sarur','SAR',1015),(1706,'Siyazan','SIY',1015),(1707,'Tartar','TAR',1015),(1708,'Tovuz','TOV',1015),(1709,'Ucar','UCA',1015),(1710,'Xacmaz','XAC',1015),(1711,'Xanlar','XAN',1015),(1712,'Xizi','XIZ',1015),(1713,'Xocali','XCI',1015),(1714,'Xocavand','XVD',1015),(1715,'Yardimli','YAR',1015),(1716,'Zangilan','ZAN',1015),(1717,'Zaqatala','ZAQ',1015),(1718,'Zardab','ZAR',1015),(1719,'Federacija Bosna i Hercegovina','BIH',1026),(1720,'Republika Srpska','SRP',1026),(1721,'Bagerhat zila','05',1017),(1722,'Bandarban zila','01',1017),(1723,'Barguna zila','02',1017),(1724,'Barisal zila','06',1017),(1725,'Bhola zila','07',1017),(1726,'Bogra zila','03',1017),(1727,'Brahmanbaria zila','04',1017),(1728,'Chandpur zila','09',1017),(1729,'Chittagong zila','10',1017),(1730,'Chuadanga zila','12',1017),(1731,'Comilla zila','08',1017),(1732,'Cox\'s Bazar zila','11',1017),(1733,'Dhaka zila','13',1017),(1734,'Dinajpur zila','14',1017),(1735,'Faridpur zila','15',1017),(1736,'Feni zila','16',1017),(1737,'Gaibandha zila','19',1017),(1738,'Gazipur zila','18',1017),(1739,'Gopalganj zila','17',1017),(1740,'Habiganj zila','20',1017),(1741,'Jaipurhat zila','24',1017),(1742,'Jamalpur zila','21',1017),(1743,'Jessore zila','22',1017),(1744,'Jhalakati zila','25',1017),(1745,'Jhenaidah zila','23',1017),(1746,'Khagrachari zila','29',1017),(1747,'Khulna zila','27',1017),(1748,'Kishorganj zila','26',1017),(1749,'Kurigram zila','28',1017),(1750,'Kushtia zila','30',1017),(1751,'Lakshmipur zila','31',1017),(1752,'Lalmonirhat zila','32',1017),(1753,'Madaripur zila','36',1017),(1754,'Magura zila','37',1017),(1755,'Manikganj zila','33',1017),(1756,'Meherpur zila','39',1017),(1757,'Moulvibazar zila','38',1017),(1758,'Munshiganj zila','35',1017),(1759,'Mymensingh zila','34',1017),(1760,'Naogaon zila','48',1017),(1761,'Narail zila','43',1017),(1762,'Narayanganj zila','40',1017),(1763,'Narsingdi zila','42',1017),(1764,'Natore zila','44',1017),(1765,'Nawabganj zila','45',1017),(1766,'Netrakona zila','41',1017),(1767,'Nilphamari zila','46',1017),(1768,'Noakhali zila','47',1017),(1769,'Pabna zila','49',1017),(1770,'Panchagarh zila','52',1017),(1771,'Patuakhali zila','51',1017),(1772,'Pirojpur zila','50',1017),(1773,'Rajbari zila','53',1017),(1774,'Rajshahi zila','54',1017),(1775,'Rangamati zila','56',1017),(1776,'Rangpur zila','55',1017),(1777,'Satkhira zila','58',1017),(1778,'Shariatpur zila','62',1017),(1779,'Sherpur zila','57',1017),(1780,'Sirajganj zila','59',1017),(1781,'Sunamganj zila','61',1017),(1782,'Sylhet zila','60',1017),(1783,'Tangail zila','63',1017),(1784,'Thakurgaon zila','64',1017),(1785,'Antwerpen','VAN',1020),(1786,'Brabant Wallon','WBR',1020),(1787,'Hainaut','WHT',1020),(1788,'Liege','WLG',1020),(1789,'Limburg','VLI',1020),(1790,'Luxembourg','WLX',1020),(1791,'Namur','WNA',1020),(1792,'Oost-Vlaanderen','VOV',1020),(1793,'Vlaams-Brabant','VBR',1020),(1794,'West-Vlaanderen','VWV',1020),(1795,'Bale','BAL',1034),(1796,'Bam','BAM',1034),(1797,'Banwa','BAN',1034),(1798,'Bazega','BAZ',1034),(1799,'Bougouriba','BGR',1034),(1800,'Boulgou','BLG',1034),(1801,'Boulkiemde','BLK',1034),(1802,'Comoe','COM',1034),(1803,'Ganzourgou','GAN',1034),(1804,'Gnagna','GNA',1034),(1805,'Gourma','GOU',1034),(1806,'Houet','HOU',1034),(1807,'Ioba','IOB',1034),(1808,'Kadiogo','KAD',1034),(1809,'Kenedougou','KEN',1034),(1810,'Komondjari','KMD',1034),(1811,'Kompienga','KMP',1034),(1812,'Kossi','KOS',1034),(1813,'Koulpulogo','KOP',1034),(1814,'Kouritenga','KOT',1034),(1815,'Kourweogo','KOW',1034),(1816,'Leraba','LER',1034),(1817,'Loroum','LOR',1034),(1818,'Mouhoun','MOU',1034),(1819,'Nahouri','NAO',1034),(1820,'Namentenga','NAM',1034),(1821,'Nayala','NAY',1034),(1822,'Noumbiel','NOU',1034),(1823,'Oubritenga','OUB',1034),(1824,'Oudalan','OUD',1034),(1825,'Passore','PAS',1034),(1826,'Poni','PON',1034),(1827,'Sanguie','SNG',1034),(1828,'Sanmatenga','SMT',1034),(1829,'Seno','SEN',1034),(1830,'Siasili','SIS',1034),(1831,'Soum','SOM',1034),(1832,'Sourou','SOR',1034),(1833,'Tapoa','TAP',1034),(1834,'Tui','TUI',1034),(1835,'Yagha','YAG',1034),(1836,'Yatenga','YAT',1034),(1837,'Ziro','ZIR',1034),(1838,'Zondoma','ZON',1034),(1839,'Zoundweogo','ZOU',1034),(1840,'Blagoevgrad','01',1033),(1841,'Burgas','02',1033),(1842,'Dobrich','08',1033),(1843,'Gabrovo','07',1033),(1844,'Haskovo','26',1033),(1845,'Yambol','28',1033),(1846,'Kardzhali','09',1033),(1847,'Kyustendil','10',1033),(1848,'Lovech','11',1033),(1849,'Montana','12',1033),(1850,'Pazardzik','13',1033),(1851,'Pernik','14',1033),(1852,'Pleven','15',1033),(1853,'Plovdiv','16',1033),(1854,'Razgrad','17',1033),(1855,'Ruse','18',1033),(1856,'Silistra','19',1033),(1857,'Sliven','20',1033),(1858,'Smolyan','21',1033),(1859,'Sofia','23',1033),(1860,'Stara Zagora','24',1033),(1861,'Shumen','27',1033),(1862,'Targovishte','25',1033),(1863,'Varna','03',1033),(1864,'Veliko Tarnovo','04',1033),(1865,'Vidin','05',1033),(1866,'Vratsa','06',1033),(1867,'Al Hadd','01',1016),(1868,'Al Manamah','03',1016),(1869,'Al Mintaqah al Gharbiyah','10',1016),(1870,'Al Mintagah al Wusta','07',1016),(1871,'Al Mintaqah ash Shamaliyah','05',1016),(1872,'Al Muharraq','02',1016),(1873,'Ar Rifa','09',1016),(1874,'Jidd Hafs','04',1016),(1875,'Madluat Jamad','12',1016),(1876,'Madluat Isa','08',1016),(1877,'Mintaqat Juzur tawar','11',1016),(1878,'Sitrah','06',1016),(1879,'Bubanza','BB',1036),(1880,'Bujumbura','BJ',1036),(1881,'Bururi','BR',1036),(1882,'Cankuzo','CA',1036),(1883,'Cibitoke','CI',1036),(1884,'Gitega','GI',1036),(1885,'Karuzi','KR',1036),(1886,'Kayanza','KY',1036),(1887,'Makamba','MA',1036),(1888,'Muramvya','MU',1036),(1889,'Mwaro','MW',1036),(1890,'Ngozi','NG',1036),(1891,'Rutana','RT',1036),(1892,'Ruyigi','RY',1036),(1893,'Alibori','AL',1022),(1894,'Atakora','AK',1022),(1895,'Atlantique','AQ',1022),(1896,'Borgou','BO',1022),(1897,'Collines','CO',1022),(1898,'Donga','DO',1022),(1899,'Kouffo','KO',1022),(1900,'Littoral','LI',1022),(1901,'Mono','MO',1022),(1902,'Oueme','OU',1022),(1903,'Plateau','PL',1022),(1904,'Zou','ZO',1022),(1905,'Belait','BE',1032),(1906,'Brunei-Muara','BM',1032),(1907,'Temburong','TE',1032),(1908,'Tutong','TU',1032),(1909,'Cochabamba','C',1025),(1910,'Chuquisaca','H',1025),(1911,'El Beni','B',1025),(1912,'La Paz','L',1025),(1913,'Oruro','O',1025),(1914,'Pando','N',1025),(1915,'Potosi','P',1025),(1916,'Tarija','T',1025),(1917,'Acre','AC',1029),(1918,'Alagoas','AL',1029),(1919,'Amazonas','AM',1029),(1920,'Amapa','AP',1029),(1921,'Bahia','BA',1029),(1922,'Ceara','CE',1029),(1923,'Distrito Federal','DF',1029),(1924,'Espirito Santo','ES',1029),(1926,'Goias','GO',1029),(1927,'Maranhao','MA',1029),(1928,'Minas Gerais','MG',1029),(1929,'Mato Grosso do Sul','MS',1029),(1930,'Mato Grosso','MT',1029),(1931,'Para','PA',1029),(1932,'Paraiba','PB',1029),(1933,'Pernambuco','PE',1029),(1934,'Piaui','PI',1029),(1935,'Parana','PR',1029),(1936,'Rio de Janeiro','RJ',1029),(1937,'Rio Grande do Norte','RN',1029),(1938,'Rondonia','RO',1029),(1939,'Roraima','RR',1029),(1940,'Rio Grande do Sul','RS',1029),(1941,'Santa Catarina','SC',1029),(1942,'Sergipe','SE',1029),(1943,'Sao Paulo','SP',1029),(1944,'Tocantins','TO',1029),(1945,'Acklins and Crooked Islands','AC',1212),(1946,'Bimini','BI',1212),(1947,'Cat Island','CI',1212),(1948,'Exuma','EX',1212),(1955,'Inagua','IN',1212),(1957,'Long Island','LI',1212),(1959,'Mayaguana','MG',1212),(1960,'New Providence','NP',1212),(1962,'Ragged Island','RI',1212),(1966,'Bumthang','33',1024),(1967,'Chhukha','12',1024),(1968,'Dagana','22',1024),(1969,'Gasa','GA',1024),(1970,'Ha','13',1024),(1971,'Lhuentse','44',1024),(1972,'Monggar','42',1024),(1973,'Paro','11',1024),(1974,'Pemagatshel','43',1024),(1975,'Punakha','23',1024),(1976,'Samdrup Jongkha','45',1024),(1977,'Samtee','14',1024),(1978,'Sarpang','31',1024),(1979,'Thimphu','15',1024),(1980,'Trashigang','41',1024),(1981,'Trashi Yangtse','TY',1024),(1982,'Trongsa','32',1024),(1983,'Tsirang','21',1024),(1984,'Wangdue Phodrang','24',1024),(1985,'Zhemgang','34',1024),(1986,'Central','CE',1027),(1987,'Ghanzi','GH',1027),(1988,'Kgalagadi','KG',1027),(1989,'Kgatleng','KL',1027),(1990,'Kweneng','KW',1027),(1991,'Ngamiland','NG',1027),(1992,'North-East','NE',1027),(1993,'North-West','NW',1027),(1994,'South-East','SE',1027),(1995,'Southern','SO',1027),(1996,'Brèsckaja voblasc\'','BR',1019),(1997,'Homel\'skaja voblasc\'','HO',1019),(1998,'Hrodzenskaja voblasc\'','HR',1019),(1999,'Mahilëuskaja voblasc\'','MA',1019),(2000,'Minskaja voblasc\'','MI',1019),(2001,'Vicebskaja voblasc\'','VI',1019),(2002,'Belize','BZ',1021),(2003,'Cayo','CY',1021),(2004,'Corozal','CZL',1021),(2005,'Orange Walk','OW',1021),(2006,'Stann Creek','SC',1021),(2007,'Toledo','TOL',1021),(2008,'Kinshasa','KN',1050),(2011,'Equateur','EQ',1050),(2014,'Kasai-Oriental','KE',1050),(2016,'Maniema','MA',1050),(2017,'Nord-Kivu','NK',1050),(2019,'Sud-Kivu','SK',1050),(2020,'Bangui','BGF',1042),(2021,'Bamingui-Bangoran','BB',1042),(2022,'Basse-Kotto','BK',1042),(2023,'Haute-Kotto','HK',1042),(2024,'Haut-Mbomou','HM',1042),(2025,'Kemo','KG',1042),(2026,'Lobaye','LB',1042),(2027,'Mambere-Kadei','HS',1042),(2028,'Mbomou','MB',1042),(2029,'Nana-Grebizi','KB',1042),(2030,'Nana-Mambere','NM',1042),(2031,'Ombella-Mpoko','MP',1042),(2032,'Ouaka','UK',1042),(2033,'Ouham','AC',1042),(2034,'Ouham-Pende','OP',1042),(2035,'Sangha-Mbaere','SE',1042),(2036,'Vakaga','VR',1042),(2037,'Brazzaville','BZV',1051),(2038,'Bouenza','11',1051),(2039,'Cuvette','8',1051),(2040,'Cuvette-Ouest','15',1051),(2041,'Kouilou','5',1051),(2042,'Lekoumou','2',1051),(2043,'Likouala','7',1051),(2044,'Niari','9',1051),(2045,'Plateaux','14',1051),(2046,'Pool','12',1051),(2047,'Sangha','13',1051),(2048,'Aargau','AG',1205),(2049,'Appenzell Innerrhoden','AI',1205),(2050,'Appenzell Ausserrhoden','AR',1205),(2051,'Bern','BE',1205),(2052,'Basel-Landschaft','BL',1205),(2053,'Basel-Stadt','BS',1205),(2054,'Fribourg','FR',1205),(2055,'Geneva','GE',1205),(2056,'Glarus','GL',1205),(2057,'Graubunden','GR',1205),(2058,'Jura','JU',1205),(2059,'Luzern','LU',1205),(2060,'Neuchatel','NE',1205),(2061,'Nidwalden','NW',1205),(2062,'Obwalden','OW',1205),(2063,'Sankt Gallen','SG',1205),(2064,'Schaffhausen','SH',1205),(2065,'Solothurn','SO',1205),(2066,'Schwyz','SZ',1205),(2067,'Thurgau','TG',1205),(2068,'Ticino','TI',1205),(2069,'Uri','UR',1205),(2070,'Vaud','VD',1205),(2071,'Valais','VS',1205),(2072,'Zug','ZG',1205),(2073,'Zurich','ZH',1205),(2074,'18 Montagnes','06',1054),(2075,'Agnebi','16',1054),(2076,'Bas-Sassandra','09',1054),(2077,'Denguele','10',1054),(2078,'Haut-Sassandra','02',1054),(2079,'Lacs','07',1054),(2080,'Lagunes','01',1054),(2081,'Marahoue','12',1054),(2082,'Moyen-Comoe','05',1054),(2083,'Nzi-Comoe','11',1054),(2084,'Savanes','03',1054),(2085,'Sud-Bandama','15',1054),(2086,'Sud-Comoe','13',1054),(2087,'Vallee du Bandama','04',1054),(2088,'Worodouqou','14',1054),(2089,'Zanzan','08',1054),(2090,'Aisen del General Carlos Ibanez del Campo','AI',1044),(2091,'Antofagasta','AN',1044),(2092,'Araucania','AR',1044),(2093,'Atacama','AT',1044),(2094,'Bio-Bio','BI',1044),(2095,'Coquimbo','CO',1044),(2096,'Libertador General Bernardo O\'Higgins','LI',1044),(2097,'Los Lagos','LL',1044),(2098,'Magallanes','MA',1044),(2099,'Maule','ML',1044),(2100,'Santiago Metropolitan','SM',1044),(2101,'Tarapaca','TA',1044),(2102,'Valparaiso','VS',1044),(2103,'Adamaoua','AD',1038),(2104,'Centre','CE',1038),(2105,'East','ES',1038),(2106,'Far North','EN',1038),(2107,'North','NO',1038),(2108,'South','SW',1038),(2109,'South-West','SW',1038),(2110,'West','OU',1038),(2111,'Beijing','11',1045),(2112,'Chongqing','50',1045),(2113,'Shanghai','31',1045),(2114,'Tianjin','12',1045),(2115,'Anhui','34',1045),(2116,'Fujian','35',1045),(2117,'Gansu','62',1045),(2118,'Guangdong','44',1045),(2119,'Guizhou','52',1045),(2120,'Hainan','46',1045),(2121,'Hebei','13',1045),(2122,'Heilongjiang','23',1045),(2123,'Henan','41',1045),(2124,'Hubei','42',1045),(2125,'Hunan','43',1045),(2126,'Jiangsu','32',1045),(2127,'Jiangxi','36',1045),(2128,'Jilin','22',1045),(2129,'Liaoning','21',1045),(2130,'Qinghai','63',1045),(2131,'Shaanxi','61',1045),(2132,'Shandong','37',1045),(2133,'Shanxi','14',1045),(2134,'Sichuan','51',1045),(2135,'Taiwan','71',1045),(2136,'Yunnan','53',1045),(2137,'Zhejiang','33',1045),(2138,'Guangxi','45',1045),(2139,'Neia Mongol (mn)','15',1045),(2140,'Xinjiang','65',1045),(2141,'Xizang','54',1045),(2142,'Hong Kong','91',1045),(2143,'Macau','92',1045),(2144,'Distrito Capital de Bogotá','DC',1048),(2145,'Amazonea','AMA',1048),(2146,'Antioquia','ANT',1048),(2147,'Arauca','ARA',1048),(2148,'Atlántico','ATL',1048),(2149,'BolÃvar','BOL',1048),(2150,'Boyacá','BOY',1048),(2151,'Caldea','CAL',1048),(2152,'Caquetá','CAQ',1048),(2153,'Casanare','CAS',1048),(2154,'Cauca','CAU',1048),(2155,'Cesar','CES',1048),(2156,'Córdoba','COR',1048),(2157,'Cundinamarca','CUN',1048),(2158,'Chocó','CHO',1048),(2159,'GuainÃa','GUA',1048),(2160,'Guaviare','GUV',1048),(2161,'La Guajira','LAG',1048),(2162,'Magdalena','MAG',1048),(2163,'Meta','MET',1048),(2164,'Nariño','NAR',1048),(2165,'Norte de Santander','NSA',1048),(2166,'Putumayo','PUT',1048),(2167,'Quindio','QUI',1048),(2168,'Risaralda','RIS',1048),(2169,'San Andrés, Providencia y Santa Catalina','SAP',1048),(2170,'Santander','SAN',1048),(2171,'Sucre','SUC',1048),(2172,'Tolima','TOL',1048),(2173,'Valle del Cauca','VAC',1048),(2174,'Vaupés','VAU',1048),(2175,'Vichada','VID',1048),(2176,'Alajuela','A',1053),(2177,'Cartago','C',1053),(2178,'Guanacaste','G',1053),(2179,'Heredia','H',1053),(2180,'Limon','L',1053),(2181,'Puntarenas','P',1053),(2182,'San Jose','SJ',1053),(2183,'Camagey','09',1056),(2184,'Ciego de `vila','08',1056),(2185,'Cienfuegos','06',1056),(2186,'Ciudad de La Habana','03',1056),(2187,'Granma','12',1056),(2188,'Guantanamo','14',1056),(2189,'Holquin','11',1056),(2190,'La Habana','02',1056),(2191,'Las Tunas','10',1056),(2192,'Matanzas','04',1056),(2193,'Pinar del Rio','01',1056),(2194,'Sancti Spiritus','07',1056),(2195,'Santiago de Cuba','13',1056),(2196,'Villa Clara','05',1056),(2197,'Isla de la Juventud','99',1056),(2198,'Pinar del Roo','PR',1056),(2199,'Ciego de Avila','CA',1056),(2200,'Camagoey','CG',1056),(2201,'Holgun','HO',1056),(2202,'Sancti Spritus','SS',1056),(2203,'Municipio Especial Isla de la Juventud','IJ',1056),(2204,'Boa Vista','BV',1040),(2205,'Brava','BR',1040),(2206,'Calheta de Sao Miguel','CS',1040),(2207,'Fogo','FO',1040),(2208,'Maio','MA',1040),(2209,'Mosteiros','MO',1040),(2210,'Paul','PA',1040),(2211,'Porto Novo','PN',1040),(2212,'Praia','PR',1040),(2213,'Ribeira Grande','RG',1040),(2214,'Sal','SL',1040),(2215,'Sao Domingos','SD',1040),(2216,'Sao Filipe','SF',1040),(2217,'Sao Nicolau','SN',1040),(2218,'Sao Vicente','SV',1040),(2219,'Tarrafal','TA',1040),(2220,'Ammochostos Magusa','04',1057),(2221,'Keryneia','06',1057),(2222,'Larnaka','03',1057),(2223,'Lefkosia','01',1057),(2224,'Lemesos','02',1057),(2225,'Pafos','05',1057),(2226,'JihoÄeský kraj','JC',1058),(2227,'Jihomoravský kraj','JM',1058),(2228,'Karlovarský kraj','KA',1058),(2229,'Královéhradecký kraj','KR',1058),(2230,'Liberecký kraj','LI',1058),(2231,'Moravskoslezský kraj','MO',1058),(2232,'Olomoucký kraj','OL',1058),(2233,'Pardubický kraj','PA',1058),(2234,'Plzeňský kraj','PL',1058),(2235,'Praha, hlavnà mÄ›sto','PR',1058),(2236,'StÅ™edoÄeský kraj','ST',1058),(2237,'Ústecký kraj','US',1058),(2238,'VysoÄina','VY',1058),(2239,'ZlÃnský kraj','ZL',1058),(2240,'Baden-Wuerttemberg','BW',1082),(2241,'Bayern','BY',1082),(2242,'Bremen','HB',1082),(2243,'Hamburg','HH',1082),(2244,'Hessen','HE',1082),(2245,'Niedersachsen','NI',1082),(2246,'Nordrhein-Westfalen','NW',1082),(2247,'Rheinland-Pfalz','RP',1082),(2248,'Saarland','SL',1082),(2249,'Schleswig-Holstein','SH',1082),(2250,'Berlin','BR',1082),(2251,'Brandenburg','BB',1082),(2252,'Mecklenburg-Vorpommern','MV',1082),(2253,'Sachsen','SN',1082),(2254,'Sachsen-Anhalt','ST',1082),(2255,'Thueringen','TH',1082),(2256,'Ali Sabiah','AS',1060),(2257,'Dikhil','DI',1060),(2258,'Djibouti','DJ',1060),(2259,'Obock','OB',1060),(2260,'Tadjoura','TA',1060),(2261,'Frederiksberg','147',1059),(2262,'Copenhagen City','101',1059),(2263,'Copenhagen','015',1059),(2264,'Frederiksborg','020',1059),(2265,'Roskilde','025',1059),(2266,'Vestsjælland','030',1059),(2267,'Storstrøm','035',1059),(2268,'Bornholm','040',1059),(2269,'Fyn','042',1059),(2270,'South Jutland','050',1059),(2271,'Ribe','055',1059),(2272,'Vejle','060',1059),(2273,'Ringkjøbing','065',1059),(2274,'Ã…rhus','070',1059),(2275,'Viborg','076',1059),(2276,'North Jutland','080',1059),(2277,'Distrito Nacional (Santo Domingo)','01',1062),(2278,'Azua','02',1062),(2279,'Bahoruco','03',1062),(2280,'Barahona','04',1062),(2281,'Dajabón','05',1062),(2282,'Duarte','06',1062),(2283,'El Seybo [El Seibo]','08',1062),(2284,'Espaillat','09',1062),(2285,'Hato Mayor','30',1062),(2286,'Independencia','10',1062),(2287,'La Altagracia','11',1062),(2288,'La Estrelleta [Elias Pina]','07',1062),(2289,'La Romana','12',1062),(2290,'La Vega','13',1062),(2291,'Maroia Trinidad Sánchez','14',1062),(2292,'Monseñor Nouel','28',1062),(2293,'Monte Cristi','15',1062),(2294,'Monte Plata','29',1062),(2295,'Pedernales','16',1062),(2296,'Peravia','17',1062),(2297,'Puerto Plata','18',1062),(2298,'Salcedo','19',1062),(2299,'Samaná','20',1062),(2300,'San Cristóbal','21',1062),(2301,'San Pedro de MacorÃs','23',1062),(2302,'Sánchez RamÃrez','24',1062),(2303,'Santiago','25',1062),(2304,'Santiago RodrÃguez','26',1062),(2305,'Valverde','27',1062),(2306,'Adrar','01',1003),(2307,'Ain Defla','44',1003),(2308,'Ain Tmouchent','46',1003),(2309,'Alger','16',1003),(2310,'Annaba','23',1003),(2311,'Batna','05',1003),(2312,'Bechar','08',1003),(2313,'Bejaia','06',1003),(2314,'Biskra','07',1003),(2315,'Blida','09',1003),(2316,'Bordj Bou Arreridj','34',1003),(2317,'Bouira','10',1003),(2318,'Boumerdes','35',1003),(2319,'Chlef','02',1003),(2320,'Constantine','25',1003),(2321,'Djelfa','17',1003),(2322,'El Bayadh','32',1003),(2323,'El Oued','39',1003),(2324,'El Tarf','36',1003),(2325,'Ghardaia','47',1003),(2326,'Guelma','24',1003),(2327,'Illizi','33',1003),(2328,'Jijel','18',1003),(2329,'Khenchela','40',1003),(2330,'Laghouat','03',1003),(2331,'Mascara','29',1003),(2332,'Medea','26',1003),(2333,'Mila','43',1003),(2334,'Mostaganem','27',1003),(2335,'Msila','28',1003),(2336,'Naama','45',1003),(2337,'Oran','31',1003),(2338,'Ouargla','30',1003),(2339,'Oum el Bouaghi','04',1003),(2340,'Relizane','48',1003),(2341,'Saida','20',1003),(2342,'Setif','19',1003),(2343,'Sidi Bel Abbes','22',1003),(2344,'Skikda','21',1003),(2345,'Souk Ahras','41',1003),(2346,'Tamanghasset','11',1003),(2347,'Tebessa','12',1003),(2348,'Tiaret','14',1003),(2349,'Tindouf','37',1003),(2350,'Tipaza','42',1003),(2351,'Tissemsilt','38',1003),(2352,'Tizi Ouzou','15',1003),(2353,'Tlemcen','13',1003),(2354,'Azuay','A',1064),(2355,'Bolivar','B',1064),(2356,'Canar','F',1064),(2357,'Carchi','C',1064),(2358,'Cotopaxi','X',1064),(2359,'Chimborazo','H',1064),(2360,'El Oro','O',1064),(2361,'Esmeraldas','E',1064),(2362,'Galapagos','W',1064),(2363,'Guayas','G',1064),(2364,'Imbabura','I',1064),(2365,'Loja','L',1064),(2366,'Los Rios','R',1064),(2367,'Manabi','M',1064),(2368,'Morona-Santiago','S',1064),(2369,'Napo','N',1064),(2370,'Orellana','D',1064),(2371,'Pastaza','Y',1064),(2372,'Pichincha','P',1064),(2373,'Sucumbios','U',1064),(2374,'Tungurahua','T',1064),(2375,'Zamora-Chinchipe','Z',1064),(2376,'Harjumaa','37',1069),(2377,'Hiiumaa','39',1069),(2378,'Ida-Virumaa','44',1069),(2379,'Jõgevamaa','49',1069),(2380,'Järvamaa','51',1069),(2381,'Läänemaa','57',1069),(2382,'Lääne-Virumaa','59',1069),(2383,'Põlvamaa','65',1069),(2384,'Pärnumaa','67',1069),(2385,'Raplamaa','70',1069),(2386,'Saaremaa','74',1069),(2387,'Tartumaa','7B',1069),(2388,'Valgamaa','82',1069),(2389,'Viljandimaa','84',1069),(2390,'Võrumaa','86',1069),(2391,'Ad Daqahllyah','DK',1065),(2392,'Al Bahr al Ahmar','BA',1065),(2393,'Al Buhayrah','BH',1065),(2394,'Al Fayym','FYM',1065),(2395,'Al Gharbiyah','GH',1065),(2396,'Al Iskandarlyah','ALX',1065),(2397,'Al Isma illyah','IS',1065),(2398,'Al Jizah','GZ',1065),(2399,'Al Minuflyah','MNF',1065),(2400,'Al Minya','MN',1065),(2401,'Al Qahirah','C',1065),(2402,'Al Qalyublyah','KB',1065),(2403,'Al Wadi al Jadid','WAD',1065),(2404,'Ash Sharqiyah','SHR',1065),(2405,'As Suways','SUZ',1065),(2406,'Aswan','ASN',1065),(2407,'Asyut','AST',1065),(2408,'Bani Suwayf','BNS',1065),(2409,'Bur Sa\'id','PTS',1065),(2410,'Dumyat','DT',1065),(2411,'Janub Sina\'','JS',1065),(2412,'Kafr ash Shaykh','KFS',1065),(2413,'Matruh','MT',1065),(2414,'Qina','KN',1065),(2415,'Shamal Sina\'','SIN',1065),(2416,'Suhaj','SHG',1065),(2417,'Anseba','AN',1068),(2418,'Debub','DU',1068),(2419,'Debubawi Keyih Bahri [Debub-Keih-Bahri]','DK',1068),(2420,'Gash-Barka','GB',1068),(2421,'Maakel [Maekel]','MA',1068),(2422,'Semenawi Keyih Bahri [Semien-Keih-Bahri]','SK',1068),(2423,'Ãlava','VI',1198),(2424,'Albacete','AB',1198),(2425,'Alicante','A',1198),(2426,'AlmerÃa','AL',1198),(2427,'Asturias','O',1198),(2428,'Ãvila','AV',1198),(2429,'Badajoz','BA',1198),(2430,'Baleares','PM',1198),(2431,'Barcelona','B',1198),(2432,'Burgos','BU',1198),(2433,'Cáceres','CC',1198),(2434,'Cádiz','CA',1198),(2435,'Cantabria','S',1198),(2436,'Castellón','CS',1198),(2437,'Ciudad Real','CR',1198),(2438,'Cuenca','CU',1198),(2439,'Girona [Gerona]','GE',1198),(2440,'Granada','GR',1198),(2441,'Guadalajara','GU',1198),(2442,'Guipúzcoa','SS',1198),(2443,'Huelva','H',1198),(2444,'Huesca','HU',1198),(2445,'Jaén','J',1198),(2446,'La Coruña','C',1198),(2447,'La Rioja','LO',1198),(2448,'Las Palmas','GC',1198),(2449,'León','LE',1198),(2450,'Lleida [Lérida]','L',1198),(2451,'Lugo','LU',1198),(2452,'Madrid','M',1198),(2453,'Málaga','MA',1198),(2454,'Murcia','MU',1198),(2455,'Navarra','NA',1198),(2456,'Ourense','OR',1198),(2457,'Palencia','P',1198),(2458,'Pontevedra','PO',1198),(2459,'Salamanca','SA',1198),(2460,'Santa Cruz de Tenerife','TF',1198),(2461,'Segovia','SG',1198),(2462,'Sevilla','SE',1198),(2463,'Soria','SO',1198),(2464,'Tarragona','T',1198),(2465,'Teruel','TE',1198),(2466,'Valencia','V',1198),(2467,'Valladolid','VA',1198),(2468,'Vizcaya','BI',1198),(2469,'Zamora','ZA',1198),(2470,'Zaragoza','Z',1198),(2471,'Ceuta','CE',1198),(2472,'Melilla','ML',1198),(2473,'Addis Ababa','AA',1070),(2474,'Dire Dawa','DD',1070),(2475,'Afar','AF',1070),(2476,'Amara','AM',1070),(2477,'Benshangul-Gumaz','BE',1070),(2478,'Gambela Peoples','GA',1070),(2479,'Harari People','HA',1070),(2480,'Oromia','OR',1070),(2481,'Somali','SO',1070),(2482,'Southern Nations, Nationalities and Peoples','SN',1070),(2483,'Tigrai','TI',1070),(2490,'Eastern','E',1074),(2491,'Northern','N',1074),(2492,'Western','W',1074),(2493,'Rotuma','R',1074),(2494,'Chuuk','TRK',1141),(2495,'Kosrae','KSA',1141),(2496,'Pohnpei','PNI',1141),(2497,'Yap','YAP',1141),(2498,'Ain','01',1076),(2499,'Aisne','02',1076),(2500,'Allier','03',1076),(2501,'Alpes-de-Haute-Provence','04',1076),(2502,'Alpes-Maritimes','06',1076),(2503,'Ardèche','07',1076),(2504,'Ardennes','08',1076),(2505,'Ariège','09',1076),(2506,'Aube','10',1076),(2507,'Aude','11',1076),(2508,'Aveyron','12',1076),(2509,'Bas-Rhin','67',1076),(2510,'Bouches-du-Rhône','13',1076),(2511,'Calvados','14',1076),(2512,'Cantal','15',1076),(2513,'Charente','16',1076),(2514,'Charente-Maritime','17',1076),(2515,'Cher','18',1076),(2516,'Corrèze','19',1076),(2517,'Corse-du-Sud','20A',1076),(2518,'Côte-d\'Or','21',1076),(2519,'Côtes-d\'Armor','22',1076),(2520,'Creuse','23',1076),(2521,'Deux-Sèvres','79',1076),(2522,'Dordogne','24',1076),(2523,'Doubs','25',1076),(2524,'Drôme','26',1076),(2525,'Essonne','91',1076),(2526,'Eure','27',1076),(2527,'Eure-et-Loir','28',1076),(2528,'Finistère','29',1076),(2529,'Gard','30',1076),(2530,'Gers','32',1076),(2531,'Gironde','33',1076),(2532,'Haut-Rhin','68',1076),(2533,'Haute-Corse','20B',1076),(2534,'Haute-Garonne','31',1076),(2535,'Haute-Loire','43',1076),(2536,'Haute-Saône','70',1076),(2537,'Haute-Savoie','74',1076),(2538,'Haute-Vienne','87',1076),(2539,'Hautes-Alpes','05',1076),(2540,'Hautes-Pyrénées','65',1076),(2541,'Hauts-de-Seine','92',1076),(2542,'Hérault','34',1076),(2543,'Indre','36',1076),(2544,'Ille-et-Vilaine','35',1076),(2545,'Indre-et-Loire','37',1076),(2546,'Isère','38',1076),(2547,'Landes','40',1076),(2548,'Loir-et-Cher','41',1076),(2549,'Loire','42',1076),(2550,'Loire-Atlantique','44',1076),(2551,'Loiret','45',1076),(2552,'Lot','46',1076),(2553,'Lot-et-Garonne','47',1076),(2554,'Lozère','48',1076),(2555,'Maine-et-Loire','49',1076),(2556,'Manche','50',1076),(2557,'Marne','51',1076),(2558,'Mayenne','53',1076),(2559,'Meurthe-et-Moselle','54',1076),(2560,'Meuse','55',1076),(2561,'Morbihan','56',1076),(2562,'Moselle','57',1076),(2563,'Nièvre','58',1076),(2564,'Nord','59',1076),(2565,'Oise','60',1076),(2566,'Orne','61',1076),(2567,'Paris','75',1076),(2568,'Pas-de-Calais','62',1076),(2569,'Puy-de-Dôme','63',1076),(2570,'Pyrénées-Atlantiques','64',1076),(2571,'Pyrénées-Orientales','66',1076),(2572,'Rhône','69',1076),(2573,'Saône-et-Loire','71',1076),(2574,'Sarthe','72',1076),(2575,'Savoie','73',1076),(2576,'Seine-et-Marne','77',1076),(2577,'Seine-Maritime','76',1076),(2578,'Seine-Saint-Denis','93',1076),(2579,'Somme','80',1076),(2580,'Tarn','81',1076),(2581,'Tarn-et-Garonne','82',1076),(2582,'Val d\'Oise','95',1076),(2583,'Territoire de Belfort','90',1076),(2584,'Val-de-Marne','94',1076),(2585,'Var','83',1076),(2586,'Vaucluse','84',1076),(2587,'Vendée','85',1076),(2588,'Vienne','86',1076),(2589,'Vosges','88',1076),(2590,'Yonne','89',1076),(2591,'Yvelines','78',1076),(2592,'Aberdeen City','ABE',1226),(2593,'Aberdeenshire','ABD',1226),(2594,'Angus','ANS',1226),(2595,'Co Antrim','ANT',1226),(2597,'Argyll and Bute','AGB',1226),(2598,'Co Armagh','ARM',1226),(2606,'Bedfordshire','BDF',1226),(2612,'Gwent','BGW',1226),(2620,'Bristol, City of','BST',1226),(2622,'Buckinghamshire','BKM',1226),(2626,'Cambridgeshire','CAM',1226),(2634,'Cheshire','CHS',1226),(2635,'Clackmannanshire','CLK',1226),(2639,'Cornwall','CON',1226),(2643,'Cumbria','CMA',1226),(2647,'Derbyshire','DBY',1226),(2648,'Co Londonderry','DRY',1226),(2649,'Devon','DEV',1226),(2651,'Dorset','DOR',1226),(2652,'Co Down','DOW',1226),(2654,'Dumfries and Galloway','DGY',1226),(2655,'Dundee City','DND',1226),(2657,'County Durham','DUR',1226),(2659,'East Ayrshire','EAY',1226),(2660,'East Dunbartonshire','EDU',1226),(2661,'East Lothian','ELN',1226),(2662,'East Renfrewshire','ERW',1226),(2663,'East Riding of Yorkshire','ERY',1226),(2664,'East Sussex','ESX',1226),(2665,'Edinburgh, City of','EDH',1226),(2666,'Na h-Eileanan Siar','ELS',1226),(2668,'Essex','ESS',1226),(2669,'Falkirk','FAL',1226),(2670,'Co Fermanagh','FER',1226),(2671,'Fife','FIF',1226),(2674,'Glasgow City','GLG',1226),(2675,'Gloucestershire','GLS',1226),(2678,'Gwynedd','GWN',1226),(2682,'Hampshire','HAM',1226),(2687,'Herefordshire','HEF',1226),(2688,'Hertfordshire','HRT',1226),(2689,'Highland','HED',1226),(2692,'Inverclyde','IVC',1226),(2694,'Isle of Wight','IOW',1226),(2699,'Kent','KEN',1226),(2705,'Lancashire','LAN',1226),(2709,'Leicestershire','LEC',1226),(2712,'Lincolnshire','LIN',1226),(2723,'Midlothian','MLN',1226),(2726,'Moray','MRY',1226),(2734,'Norfolk','NFK',1226),(2735,'North Ayrshire','NAY',1226),(2738,'North Lanarkshire','NLK',1226),(2742,'North Yorkshire','NYK',1226),(2743,'Northamptonshire','NTH',1226),(2744,'Northumberland','NBL',1226),(2746,'Nottinghamshire','NTT',1226),(2747,'Oldham','OLD',1226),(2748,'Omagh','OMH',1226),(2749,'Orkney Islands','ORR',1226),(2750,'Oxfordshire','OXF',1226),(2752,'Perth and Kinross','PKN',1226),(2757,'Powys','POW',1226),(2761,'Renfrewshire','RFW',1226),(2766,'Rutland','RUT',1226),(2770,'Scottish Borders','SCB',1226),(2773,'Shetland Islands','ZET',1226),(2774,'Shropshire','SHR',1226),(2777,'Somerset','SOM',1226),(2778,'South Ayrshire','SAY',1226),(2779,'South Gloucestershire','SGC',1226),(2780,'South Lanarkshire','SLK',1226),(2785,'Staffordshire','STS',1226),(2786,'Stirling','STG',1226),(2791,'Suffolk','SFK',1226),(2793,'Surrey','SRY',1226),(2804,'Mid Glamorgan','VGL',1226),(2811,'Warwickshire','WAR',1226),(2813,'West Dunbartonshire','WDU',1226),(2814,'West Lothian','WLN',1226),(2815,'West Sussex','WSX',1226),(2818,'Wiltshire','WIL',1226),(2823,'Worcestershire','WOR',1226),(2826,'Ashanti','AH',1083),(2827,'Brong-Ahafo','BA',1083),(2828,'Greater Accra','AA',1083),(2829,'Upper East','UE',1083),(2830,'Upper West','UW',1083),(2831,'Volta','TV',1083),(2832,'Banjul','B',1213),(2833,'Lower River','L',1213),(2834,'MacCarthy Island','M',1213),(2835,'North Bank','N',1213),(2836,'Upper River','U',1213),(2837,'Beyla','BE',1091),(2838,'Boffa','BF',1091),(2839,'Boke','BK',1091),(2840,'Coyah','CO',1091),(2841,'Dabola','DB',1091),(2842,'Dalaba','DL',1091),(2843,'Dinguiraye','DI',1091),(2844,'Dubreka','DU',1091),(2845,'Faranah','FA',1091),(2846,'Forecariah','FO',1091),(2847,'Fria','FR',1091),(2848,'Gaoual','GA',1091),(2849,'Guekedou','GU',1091),(2850,'Kankan','KA',1091),(2851,'Kerouane','KE',1091),(2852,'Kindia','KD',1091),(2853,'Kissidougou','KS',1091),(2854,'Koubia','KB',1091),(2855,'Koundara','KN',1091),(2856,'Kouroussa','KO',1091),(2857,'Labe','LA',1091),(2858,'Lelouma','LE',1091),(2859,'Lola','LO',1091),(2860,'Macenta','MC',1091),(2861,'Mali','ML',1091),(2862,'Mamou','MM',1091),(2863,'Mandiana','MD',1091),(2864,'Nzerekore','NZ',1091),(2865,'Pita','PI',1091),(2866,'Siguiri','SI',1091),(2867,'Telimele','TE',1091),(2868,'Tougue','TO',1091),(2869,'Yomou','YO',1091),(2870,'Region Continental','C',1067),(2871,'Region Insular','I',1067),(2872,'Annobon','AN',1067),(2873,'Bioko Norte','BN',1067),(2874,'Bioko Sur','BS',1067),(2875,'Centro Sur','CS',1067),(2876,'Kie-Ntem','KN',1067),(2877,'Litoral','LI',1067),(2878,'Wele-Nzas','WN',1067),(2879,'Achaïa','13',1085),(2880,'Aitolia-Akarnania','01',1085),(2881,'Argolis','11',1085),(2882,'Arkadia','12',1085),(2883,'Arta','31',1085),(2884,'Attiki','A1',1085),(2885,'Chalkidiki','64',1085),(2886,'Chania','94',1085),(2887,'Chios','85',1085),(2888,'Dodekanisos','81',1085),(2889,'Drama','52',1085),(2890,'Evros','71',1085),(2891,'Evrytania','05',1085),(2892,'Evvoia','04',1085),(2893,'Florina','63',1085),(2894,'Fokis','07',1085),(2895,'Fthiotis','06',1085),(2896,'Grevena','51',1085),(2897,'Ileia','14',1085),(2898,'Imathia','53',1085),(2899,'Ioannina','33',1085),(2900,'Irakleion','91',1085),(2901,'Karditsa','41',1085),(2902,'Kastoria','56',1085),(2903,'Kavalla','55',1085),(2904,'Kefallinia','23',1085),(2905,'Kerkyra','22',1085),(2906,'Kilkis','57',1085),(2907,'Korinthia','15',1085),(2908,'Kozani','58',1085),(2909,'Kyklades','82',1085),(2910,'Lakonia','16',1085),(2911,'Larisa','42',1085),(2912,'Lasithion','92',1085),(2913,'Lefkas','24',1085),(2914,'Lesvos','83',1085),(2915,'Magnisia','43',1085),(2916,'Messinia','17',1085),(2917,'Pella','59',1085),(2918,'Preveza','34',1085),(2919,'Rethymnon','93',1085),(2920,'Rodopi','73',1085),(2921,'Samos','84',1085),(2922,'Serrai','62',1085),(2923,'Thesprotia','32',1085),(2924,'Thessaloniki','54',1085),(2925,'Trikala','44',1085),(2926,'Voiotia','03',1085),(2927,'Xanthi','72',1085),(2928,'Zakynthos','21',1085),(2929,'Agio Oros','69',1085),(2930,'Alta Verapaz','AV',1090),(2931,'Baja Verapaz','BV',1090),(2932,'Chimaltenango','CM',1090),(2933,'Chiquimula','CQ',1090),(2934,'El Progreso','PR',1090),(2935,'Escuintla','ES',1090),(2936,'Guatemala','GU',1090),(2937,'Huehuetenango','HU',1090),(2938,'Izabal','IZ',1090),(2939,'Jalapa','JA',1090),(2940,'Jutiapa','JU',1090),(2941,'Peten','PE',1090),(2942,'Quetzaltenango','QZ',1090),(2943,'Quiche','QC',1090),(2944,'Retalhuleu','RE',1090),(2945,'Sacatepequez','SA',1090),(2946,'San Marcos','SM',1090),(2947,'Santa Rosa','SR',1090),(2948,'Sololá','SO',1090),(2949,'Suchitepequez','SU',1090),(2950,'Totonicapan','TO',1090),(2951,'Zacapa','ZA',1090),(2952,'Bissau','BS',1092),(2953,'Bafata','BA',1092),(2954,'Biombo','BM',1092),(2955,'Bolama','BL',1092),(2956,'Cacheu','CA',1092),(2957,'Gabu','GA',1092),(2958,'Oio','OI',1092),(2959,'Quloara','QU',1092),(2960,'Tombali S','TO',1092),(2961,'Barima-Waini','BA',1093),(2962,'Cuyuni-Mazaruni','CU',1093),(2963,'Demerara-Mahaica','DE',1093),(2964,'East Berbice-Corentyne','EB',1093),(2965,'Essequibo Islands-West Demerara','ES',1093),(2966,'Mahaica-Berbice','MA',1093),(2967,'Pomeroon-Supenaam','PM',1093),(2968,'Potaro-Siparuni','PT',1093),(2969,'Upper Demerara-Berbice','UD',1093),(2970,'Upper Takutu-Upper Essequibo','UT',1093),(2971,'Atlantida','AT',1097),(2972,'Colon','CL',1097),(2973,'Comayagua','CM',1097),(2974,'Copan','CP',1097),(2975,'Cortes','CR',1097),(2976,'Choluteca','CH',1097),(2977,'El Paraiso','EP',1097),(2978,'Francisco Morazan','FM',1097),(2979,'Gracias a Dios','GD',1097),(2980,'Intibuca','IN',1097),(2981,'Islas de la Bahia','IB',1097),(2982,'Lempira','LE',1097),(2983,'Ocotepeque','OC',1097),(2984,'Olancho','OL',1097),(2985,'Santa Barbara','SB',1097),(2986,'Valle','VA',1097),(2987,'Yoro','YO',1097),(2988,'Bjelovarsko-bilogorska zupanija','07',1055),(2989,'Brodsko-posavska zupanija','12',1055),(2990,'Dubrovacko-neretvanska zupanija','19',1055),(2991,'Istarska zupanija','18',1055),(2992,'Karlovacka zupanija','04',1055),(2993,'Koprivnickco-krizevacka zupanija','06',1055),(2994,'Krapinako-zagorska zupanija','02',1055),(2995,'Licko-senjska zupanija','09',1055),(2996,'Medimurska zupanija','20',1055),(2997,'Osjecko-baranjska zupanija','14',1055),(2998,'Pozesko-slavonska zupanija','11',1055),(2999,'Primorsko-goranska zupanija','08',1055),(3000,'Sisacko-moelavacka Iupanija','03',1055),(3001,'Splitako-dalmatinska zupanija','17',1055),(3002,'Sibenako-kninska zupanija','15',1055),(3003,'Varaidinska zupanija','05',1055),(3004,'VirovitiEko-podravska zupanija','10',1055),(3005,'VuRovarako-srijemska zupanija','16',1055),(3006,'Zadaraka','13',1055),(3007,'Zagrebacka zupanija','01',1055),(3008,'Grande-Anse','GA',1094),(3009,'Nord-Est','NE',1094),(3010,'Nord-Ouest','NO',1094),(3011,'Ouest','OU',1094),(3012,'Sud','SD',1094),(3013,'Sud-Est','SE',1094),(3014,'Budapest','BU',1099),(3015,'Bács-Kiskun','BK',1099),(3016,'Baranya','BA',1099),(3017,'Békés','BE',1099),(3018,'Borsod-Abaúj-Zemplén','BZ',1099),(3019,'Csongrád','CS',1099),(3020,'Fejér','FE',1099),(3021,'GyÅ‘r-Moson-Sopron','GS',1099),(3022,'Hajdu-Bihar','HB',1099),(3023,'Heves','HE',1099),(3024,'Jász-Nagykun-Szolnok','JN',1099),(3025,'Komárom-Esztergom','KE',1099),(3026,'Nográd','NO',1099),(3027,'Pest','PE',1099),(3028,'Somogy','SO',1099),(3029,'Szabolcs-Szatmár-Bereg','SZ',1099),(3030,'Tolna','TO',1099),(3031,'Vas','VA',1099),(3032,'Veszprém','VE',1099),(3033,'Zala','ZA',1099),(3034,'Békéscsaba','BC',1099),(3035,'Debrecen','DE',1099),(3036,'Dunaújváros','DU',1099),(3037,'Eger','EG',1099),(3038,'GyÅ‘r','GY',1099),(3039,'HódmezÅ‘vásárhely','HV',1099),(3040,'Kaposvár','KV',1099),(3041,'Kecskemét','KM',1099),(3042,'Miskolc','MI',1099),(3043,'Nagykanizsa','NK',1099),(3044,'Nyiregyháza','NY',1099),(3045,'Pécs','PS',1099),(3046,'Salgótarján','ST',1099),(3047,'Sopron','SN',1099),(3048,'Szeged','SD',1099),(3049,'Székesfehérvár','SF',1099),(3050,'Szekszárd','SS',1099),(3051,'Szolnok','SK',1099),(3052,'Szombathely','SH',1099),(3053,'Tatabánya','TB',1099),(3054,'Zalaegerszeg','ZE',1099),(3055,'Bali','BA',1102),(3056,'Kepulauan Bangka Belitung','BB',1102),(3057,'Banten','BT',1102),(3058,'Bengkulu','BE',1102),(3059,'Gorontalo','GO',1102),(3060,'Papua Barat','PB',1102),(3061,'Jambi','JA',1102),(3062,'Jawa Barat','JB',1102),(3063,'Jawa Tengah','JT',1102),(3064,'Jawa Timur','JI',1102),(3065,'Kalimantan Barat','KB',1102),(3066,'Kalimantan Timur','KI',1102),(3067,'Kalimantan Selatan','KS',1102),(3068,'Kepulauan Riau','KR',1102),(3069,'Lampung','LA',1102),(3070,'Maluku','MA',1102),(3071,'Maluku Utara','MU',1102),(3072,'Nusa Tenggara Barat','NB',1102),(3073,'Nusa Tenggara Timur','NT',1102),(3074,'Papua','PA',1102),(3075,'Riau','RI',1102),(3076,'Sulawesi Selatan','SN',1102),(3077,'Sulawesi Tengah','ST',1102),(3078,'Sulawesi Tenggara','SG',1102),(3079,'Sulawesi Utara','SA',1102),(3080,'Sumatra Barat','SB',1102),(3081,'Sumatra Selatan','SS',1102),(3082,'Sumatera Utara','SU',1102),(3083,'DKI Jakarta','JK',1102),(3084,'Aceh','AC',1102),(3085,'DI Yogyakarta','YO',1102),(3086,'Cork','C',1105),(3087,'Clare','CE',1105),(3088,'Cavan','CN',1105),(3089,'Carlow','CW',1105),(3090,'Dublin','D',1105),(3091,'Donegal','DL',1105),(3092,'Galway','G',1105),(3093,'Kildare','KE',1105),(3094,'Kilkenny','KK',1105),(3095,'Kerry','KY',1105),(3096,'Longford','LD',1105),(3097,'Louth','LH',1105),(3098,'Limerick','LK',1105),(3099,'Leitrim','LM',1105),(3100,'Laois','LS',1105),(3101,'Meath','MH',1105),(3102,'Monaghan','MN',1105),(3103,'Mayo','MO',1105),(3104,'Offaly','OY',1105),(3105,'Roscommon','RN',1105),(3106,'Sligo','SO',1105),(3107,'Tipperary','TA',1105),(3108,'Waterford','WD',1105),(3109,'Westmeath','WH',1105),(3110,'Wicklow','WW',1105),(3111,'Wexford','WX',1105),(3112,'HaDarom','D',1106),(3113,'HaMerkaz','M',1106),(3114,'HaZafon','Z',1106),(3115,'Haifa','HA',1106),(3116,'Tel-Aviv','TA',1106),(3117,'Jerusalem','JM',1106),(3118,'Al Anbar','AN',1104),(3119,'Al Ba,rah','BA',1104),(3120,'Al Muthanna','MU',1104),(3121,'Al Qadisiyah','QA',1104),(3122,'An Najef','NA',1104),(3123,'Arbil','AR',1104),(3124,'As Sulaymaniyah','SW',1104),(3125,'At Ta\'mim','TS',1104),(3126,'Babil','BB',1104),(3127,'Baghdad','BG',1104),(3128,'Dahuk','DA',1104),(3129,'Dhi Qar','DQ',1104),(3130,'Diyala','DI',1104),(3131,'Karbala\'','KA',1104),(3132,'Maysan','MA',1104),(3133,'Ninawa','NI',1104),(3134,'Salah ad Din','SD',1104),(3135,'Wasit','WA',1104),(3136,'Ardabil','03',1103),(3137,'Azarbayjan-e Gharbi','02',1103),(3138,'Azarbayjan-e Sharqi','01',1103),(3139,'Bushehr','06',1103),(3140,'Chahar Mahall va Bakhtiari','08',1103),(3141,'Esfahan','04',1103),(3142,'Fars','14',1103),(3143,'Gilan','19',1103),(3144,'Golestan','27',1103),(3145,'Hamadan','24',1103),(3146,'Hormozgan','23',1103),(3147,'Iiam','05',1103),(3148,'Kerman','15',1103),(3149,'Kermanshah','17',1103),(3150,'Khorasan','09',1103),(3151,'Khuzestan','10',1103),(3152,'Kohjiluyeh va Buyer Ahmad','18',1103),(3153,'Kordestan','16',1103),(3154,'Lorestan','20',1103),(3155,'Markazi','22',1103),(3156,'Mazandaran','21',1103),(3157,'Qazvin','28',1103),(3158,'Qom','26',1103),(3159,'Semnan','12',1103),(3160,'Sistan va Baluchestan','13',1103),(3161,'Tehran','07',1103),(3162,'Yazd','25',1103),(3163,'Zanjan','11',1103),(3164,'Austurland','7',1100),(3165,'Hofuoborgarsvaeoi utan Reykjavikur','1',1100),(3166,'Norourland eystra','6',1100),(3167,'Norourland vestra','5',1100),(3168,'Reykjavik','0',1100),(3169,'Suourland','8',1100),(3170,'Suournes','2',1100),(3171,'Vestfirolr','4',1100),(3172,'Vesturland','3',1100),(3173,'Agrigento','AG',1107),(3174,'Alessandria','AL',1107),(3175,'Ancona','AN',1107),(3176,'Aosta','AO',1107),(3177,'Arezzo','AR',1107),(3178,'Ascoli Piceno','AP',1107),(3179,'Asti','AT',1107),(3180,'Avellino','AV',1107),(3181,'Bari','BA',1107),(3182,'Belluno','BL',1107),(3183,'Benevento','BN',1107),(3184,'Bergamo','BG',1107),(3185,'Biella','BI',1107),(3186,'Bologna','BO',1107),(3187,'Bolzano','BZ',1107),(3188,'Brescia','BS',1107),(3189,'Brindisi','BR',1107),(3190,'Cagliari','CA',1107),(3191,'Caltanissetta','CL',1107),(3192,'Campobasso','CB',1107),(3193,'Caserta','CE',1107),(3194,'Catania','CT',1107),(3195,'Catanzaro','CZ',1107),(3196,'Chieti','CH',1107),(3197,'Como','CO',1107),(3198,'Cosenza','CS',1107),(3199,'Cremona','CR',1107),(3200,'Crotone','KR',1107),(3201,'Cuneo','CN',1107),(3202,'Enna','EN',1107),(3203,'Ferrara','FE',1107),(3204,'Firenze','FI',1107),(3205,'Foggia','FG',1107),(3206,'Forlì-Cesena','FC',1107),(3207,'Frosinone','FR',1107),(3208,'Genova','GE',1107),(3209,'Gorizia','GO',1107),(3210,'Grosseto','GR',1107),(3211,'Imperia','IM',1107),(3212,'Isernia','IS',1107),(3213,'L\'Aquila','AQ',1107),(3214,'La Spezia','SP',1107),(3215,'Latina','LT',1107),(3216,'Lecce','LE',1107),(3217,'Lecco','LC',1107),(3218,'Livorno','LI',1107),(3219,'Lodi','LO',1107),(3220,'Lucca','LU',1107),(3221,'Macerata','MC',1107),(3222,'Mantova','MN',1107),(3223,'Massa-Carrara','MS',1107),(3224,'Matera','MT',1107),(3225,'Messina','ME',1107),(3226,'Milano','MI',1107),(3227,'Modena','MO',1107),(3228,'Napoli','NA',1107),(3229,'Novara','NO',1107),(3230,'Nuoro','NU',1107),(3231,'Oristano','OR',1107),(3232,'Padova','PD',1107),(3233,'Palermo','PA',1107),(3234,'Parma','PR',1107),(3235,'Pavia','PV',1107),(3236,'Perugia','PG',1107),(3237,'Pesaro e Urbino','PU',1107),(3238,'Pescara','PE',1107),(3239,'Piacenza','PC',1107),(3240,'Pisa','PI',1107),(3241,'Pistoia','PT',1107),(3242,'Pordenone','PN',1107),(3243,'Potenza','PZ',1107),(3244,'Prato','PO',1107),(3245,'Ragusa','RG',1107),(3246,'Ravenna','RA',1107),(3247,'Reggio Calabria','RC',1107),(3248,'Reggio Emilia','RE',1107),(3249,'Rieti','RI',1107),(3250,'Rimini','RN',1107),(3251,'Roma','RM',1107),(3252,'Rovigo','RO',1107),(3253,'Salerno','SA',1107),(3254,'Sassari','SS',1107),(3255,'Savona','SV',1107),(3256,'Siena','SI',1107),(3257,'Siracusa','SR',1107),(3258,'Sondrio','SO',1107),(3259,'Taranto','TA',1107),(3260,'Teramo','TE',1107),(3261,'Terni','TR',1107),(3262,'Torino','TO',1107),(3263,'Trapani','TP',1107),(3264,'Trento','TN',1107),(3265,'Treviso','TV',1107),(3266,'Trieste','TS',1107),(3267,'Udine','UD',1107),(3268,'Varese','VA',1107),(3269,'Venezia','VE',1107),(3270,'Verbano-Cusio-Ossola','VB',1107),(3271,'Vercelli','VC',1107),(3272,'Verona','VR',1107),(3273,'Vibo Valentia','VV',1107),(3274,'Vicenza','VI',1107),(3275,'Viterbo','VT',1107),(3276,'Aichi','23',1109),(3277,'Akita','05',1109),(3278,'Aomori','02',1109),(3279,'Chiba','12',1109),(3280,'Ehime','38',1109),(3281,'Fukui','18',1109),(3282,'Fukuoka','40',1109),(3283,'Fukusima','07',1109),(3284,'Gifu','21',1109),(3285,'Gunma','10',1109),(3286,'Hiroshima','34',1109),(3287,'Hokkaido','01',1109),(3288,'Hyogo','28',1109),(3289,'Ibaraki','08',1109),(3290,'Ishikawa','17',1109),(3291,'Iwate','03',1109),(3292,'Kagawa','37',1109),(3293,'Kagoshima','46',1109),(3294,'Kanagawa','14',1109),(3295,'Kochi','39',1109),(3296,'Kumamoto','43',1109),(3297,'Kyoto','26',1109),(3298,'Mie','24',1109),(3299,'Miyagi','04',1109),(3300,'Miyazaki','45',1109),(3301,'Nagano','20',1109),(3302,'Nagasaki','42',1109),(3303,'Nara','29',1109),(3304,'Niigata','15',1109),(3305,'Oita','44',1109),(3306,'Okayama','33',1109),(3307,'Okinawa','47',1109),(3308,'Osaka','27',1109),(3309,'Saga','41',1109),(3310,'Saitama','11',1109),(3311,'Shiga','25',1109),(3312,'Shimane','32',1109),(3313,'Shizuoka','22',1109),(3314,'Tochigi','09',1109),(3315,'Tokushima','36',1109),(3316,'Tokyo','13',1109),(3317,'Tottori','31',1109),(3318,'Toyama','16',1109),(3319,'Wakayama','30',1109),(3320,'Yamagata','06',1109),(3321,'Yamaguchi','35',1109),(3322,'Yamanashi','19',1109),(3323,'Clarendon','CN',1108),(3324,'Hanover','HR',1108),(3325,'Kingston','KN',1108),(3326,'Portland','PD',1108),(3327,'Saint Andrew','AW',1108),(3328,'Saint Ann','AN',1108),(3329,'Saint Catherine','CE',1108),(3330,'Saint Elizabeth','EH',1108),(3331,'Saint James','JS',1108),(3332,'Saint Mary','MY',1108),(3333,'Saint Thomas','TS',1108),(3334,'Trelawny','TY',1108),(3335,'Westmoreland','WD',1108),(3336,'Ajln','AJ',1110),(3337,'Al \'Aqaba','AQ',1110),(3338,'Al Balqa\'','BA',1110),(3339,'Al Karak','KA',1110),(3340,'Al Mafraq','MA',1110),(3341,'Amman','AM',1110),(3342,'At Tafilah','AT',1110),(3343,'Az Zarga','AZ',1110),(3344,'Irbid','JR',1110),(3345,'Jarash','JA',1110),(3346,'Ma\'an','MN',1110),(3347,'Madaba','MD',1110),(3348,'Nairobi Municipality','110',1112),(3349,'Coast','300',1112),(3350,'North-Eastern Kaskazini Mashariki','500',1112),(3351,'Rift Valley','700',1112),(3352,'Western Magharibi','900',1112),(3353,'Bishkek','GB',1117),(3354,'Batken','B',1117),(3355,'Chu','C',1117),(3356,'Jalal-Abad','J',1117),(3357,'Naryn','N',1117),(3358,'Osh','O',1117),(3359,'Talas','T',1117),(3360,'Ysyk-Kol','Y',1117),(3361,'Krong Kaeb','23',1037),(3362,'Krong Pailin','24',1037),(3363,'Xrong Preah Sihanouk','18',1037),(3364,'Phnom Penh','12',1037),(3365,'Baat Dambang','2',1037),(3366,'Banteay Mean Chey','1',1037),(3367,'Rampong Chaam','3',1037),(3368,'Kampong Chhnang','4',1037),(3369,'Kampong Spueu','5',1037),(3370,'Kampong Thum','6',1037),(3371,'Kampot','7',1037),(3372,'Kandaal','8',1037),(3373,'Kach Kong','9',1037),(3374,'Krachoh','10',1037),(3375,'Mondol Kiri','11',1037),(3376,'Otdar Mean Chey','22',1037),(3377,'Pousaat','15',1037),(3378,'Preah Vihear','13',1037),(3379,'Prey Veaeng','14',1037),(3380,'Rotanak Kiri','16',1037),(3381,'Siem Reab','17',1037),(3382,'Stueng Traeng','19',1037),(3383,'Svaay Rieng','20',1037),(3384,'Taakaev','21',1037),(3385,'Gilbert Islands','G',1113),(3386,'Line Islands','L',1113),(3387,'Phoenix Islands','P',1113),(3388,'Anjouan Ndzouani','A',1049),(3389,'Grande Comore Ngazidja','G',1049),(3390,'Moheli Moili','M',1049),(3391,'Kaesong-si','KAE',1114),(3392,'Nampo-si','NAM',1114),(3393,'Pyongyang-ai','PYO',1114),(3394,'Chagang-do','CHA',1114),(3395,'Hamgyongbuk-do','HAB',1114),(3396,'Hamgyongnam-do','HAN',1114),(3397,'Hwanghaebuk-do','HWB',1114),(3398,'Hwanghaenam-do','HWN',1114),(3399,'Kangwon-do','KAN',1114),(3400,'Pyonganbuk-do','PYB',1114),(3401,'Pyongannam-do','PYN',1114),(3402,'Yanggang-do','YAN',1114),(3403,'Najin Sonbong-si','NAJ',1114),(3404,'Seoul Teugbyeolsi','11',1115),(3405,'Busan Gwang\'yeogsi','26',1115),(3406,'Daegu Gwang\'yeogsi','27',1115),(3407,'Daejeon Gwang\'yeogsi','30',1115),(3408,'Gwangju Gwang\'yeogsi','29',1115),(3409,'Incheon Gwang\'yeogsi','28',1115),(3410,'Ulsan Gwang\'yeogsi','31',1115),(3411,'Chungcheongbugdo','43',1115),(3412,'Chungcheongnamdo','44',1115),(3413,'Gang\'weondo','42',1115),(3414,'Gyeonggido','41',1115),(3415,'Gyeongsangbugdo','47',1115),(3416,'Gyeongsangnamdo','48',1115),(3417,'Jejudo','49',1115),(3418,'Jeonrabugdo','45',1115),(3419,'Jeonranamdo','46',1115),(3420,'Al Ahmadi','AH',1116),(3421,'Al Farwanlyah','FA',1116),(3422,'Al Jahrah','JA',1116),(3423,'Al Kuwayt','KU',1116),(3424,'Hawalli','HA',1116),(3425,'Almaty','ALA',1111),(3426,'Astana','AST',1111),(3427,'Almaty oblysy','ALM',1111),(3428,'Aqmola oblysy','AKM',1111),(3429,'Aqtobe oblysy','AKT',1111),(3430,'Atyrau oblyfiy','ATY',1111),(3431,'Batys Quzaqstan oblysy','ZAP',1111),(3432,'Mangghystau oblysy','MAN',1111),(3433,'Ongtustik Quzaqstan oblysy','YUZ',1111),(3434,'Pavlodar oblysy','PAV',1111),(3435,'Qaraghandy oblysy','KAR',1111),(3436,'Qostanay oblysy','KUS',1111),(3437,'Qyzylorda oblysy','KZY',1111),(3438,'Shyghys Quzaqstan oblysy','VOS',1111),(3439,'Soltustik Quzaqstan oblysy','SEV',1111),(3440,'Zhambyl oblysy Zhambylskaya oblast\'','ZHA',1111),(3441,'Vientiane','VT',1118),(3442,'Attapu','AT',1118),(3443,'Bokeo','BK',1118),(3444,'Bolikhamxai','BL',1118),(3445,'Champasak','CH',1118),(3446,'Houaphan','HO',1118),(3447,'Khammouan','KH',1118),(3448,'Louang Namtha','LM',1118),(3449,'Louangphabang','LP',1118),(3450,'Oudomxai','OU',1118),(3451,'Phongsali','PH',1118),(3452,'Salavan','SL',1118),(3453,'Savannakhet','SV',1118),(3454,'Xaignabouli','XA',1118),(3455,'Xiasomboun','XN',1118),(3456,'Xekong','XE',1118),(3457,'Xiangkhoang','XI',1118),(3458,'Beirut','BA',1120),(3459,'Beqaa','BI',1120),(3460,'Mount Lebanon','JL',1120),(3461,'North Lebanon','AS',1120),(3462,'South Lebanon','JA',1120),(3463,'Nabatieh','NA',1120),(3464,'Ampara','52',1199),(3465,'Anuradhapura','71',1199),(3466,'Badulla','81',1199),(3467,'Batticaloa','51',1199),(3468,'Colombo','11',1199),(3469,'Galle','31',1199),(3470,'Gampaha','12',1199),(3471,'Hambantota','33',1199),(3472,'Jaffna','41',1199),(3473,'Kalutara','13',1199),(3474,'Kandy','21',1199),(3475,'Kegalla','92',1199),(3476,'Kilinochchi','42',1199),(3477,'Kurunegala','61',1199),(3478,'Mannar','43',1199),(3479,'Matale','22',1199),(3480,'Matara','32',1199),(3481,'Monaragala','82',1199),(3482,'Mullaittivu','45',1199),(3483,'Nuwara Eliya','23',1199),(3484,'Polonnaruwa','72',1199),(3485,'Puttalum','62',1199),(3486,'Ratnapura','91',1199),(3487,'Trincomalee','53',1199),(3488,'VavunLya','44',1199),(3489,'Bomi','BM',1122),(3490,'Bong','BG',1122),(3491,'Grand Basaa','GB',1122),(3492,'Grand Cape Mount','CM',1122),(3493,'Grand Gedeh','GG',1122),(3494,'Grand Kru','GK',1122),(3495,'Lofa','LO',1122),(3496,'Margibi','MG',1122),(3497,'Maryland','MY',1122),(3498,'Montserrado','MO',1122),(3499,'Nimba','NI',1122),(3500,'Rivercess','RI',1122),(3501,'Sinoe','SI',1122),(3502,'Berea','D',1121),(3503,'Butha-Buthe','B',1121),(3504,'Leribe','C',1121),(3505,'Mafeteng','E',1121),(3506,'Maseru','A',1121),(3507,'Mohale\'s Hoek','F',1121),(3508,'Mokhotlong','J',1121),(3509,'Qacha\'s Nek','H',1121),(3510,'Quthing','G',1121),(3511,'Thaba-Tseka','K',1121),(3512,'Alytaus Apskritis','AL',1125),(3513,'Kauno Apskritis','KU',1125),(3514,'KlaipÄ—dos Apskritis','KL',1125),(3515,'MarijampolÄ—s Apskritis','MR',1125),(3516,'Panevėžio Apskritis','PN',1125),(3517,'Å iaulių Apskritis','SA',1125),(3518,'TauragÄ—s Apskritis','TA',1125),(3519,'TelÅ¡ių Apskritis','TE',1125),(3520,'Utenos Apskritis','UT',1125),(3521,'Vilniaus Apskritis','VL',1125),(3522,'Diekirch','D',1126),(3523,'GreveNmacher','G',1126),(3550,'Daugavpils','DGV',1119),(3551,'Jelgava','JEL',1119),(3552,'JÅ«rmala','JUR',1119),(3553,'LiepÄja','LPX',1119),(3554,'RÄ“zekne','REZ',1119),(3555,'RÄ«ga','RIX',1119),(3556,'Ventspils','VEN',1119),(3557,'AjdÄbiyÄ','AJ',1123),(3558,'Al BuÅ£nÄn','BU',1123),(3559,'Al HizÄm al Akhdar','HZ',1123),(3560,'Al Jabal al Akhdar','JA',1123),(3561,'Al JifÄrah','JI',1123),(3562,'Al Jufrah','JU',1123),(3563,'Al Kufrah','KF',1123),(3564,'Al Marj','MJ',1123),(3565,'Al Marqab','MB',1123),(3566,'Al QaÅ£rÅ«n','QT',1123),(3567,'Al Qubbah','QB',1123),(3568,'Al WÄhah','WA',1123),(3569,'An NuqaÅ£ al Khams','NQ',1123),(3570,'Ash ShÄÅ£i\'','SH',1123),(3571,'Az ZÄwiyah','ZA',1123),(3572,'BanghÄzÄ«','BA',1123),(3573,'BanÄ« WalÄ«d','BW',1123),(3574,'Darnah','DR',1123),(3575,'GhadÄmis','GD',1123),(3576,'GharyÄn','GR',1123),(3577,'GhÄt','GT',1123),(3578,'JaghbÅ«b','JB',1123),(3579,'MiÅŸrÄtah','MI',1123),(3580,'Mizdah','MZ',1123),(3581,'Murzuq','MQ',1123),(3582,'NÄlÅ«t','NL',1123),(3583,'SabhÄ','SB',1123),(3584,'ÅžabrÄtah ÅžurmÄn','SS',1123),(3585,'Surt','SR',1123),(3586,'TÄjÅ«rÄ\' wa an NawÄhÄ« al ArbÄh','TN',1123),(3587,'Å¢arÄbulus','TB',1123),(3588,'TarhÅ«nah-MasallÄtah','TM',1123),(3589,'WÄdÄ« al hayÄt','WD',1123),(3590,'Yafran-JÄdÅ«','YJ',1123),(3591,'Agadir','AGD',1146),(3592,'Aït Baha','BAH',1146),(3593,'Aït Melloul','MEL',1146),(3594,'Al Haouz','HAO',1146),(3595,'Al Hoceïma','HOC',1146),(3596,'Assa-Zag','ASZ',1146),(3597,'Azilal','AZI',1146),(3598,'Beni Mellal','BEM',1146),(3599,'Ben Sllmane','BES',1146),(3600,'Berkane','BER',1146),(3601,'Boujdour','BOD',1146),(3602,'Boulemane','BOM',1146),(3603,'Casablanca [Dar el Beïda]','CAS',1146),(3604,'Chefchaouene','CHE',1146),(3605,'Chichaoua','CHI',1146),(3606,'El Hajeb','HAJ',1146),(3607,'El Jadida','JDI',1146),(3608,'Errachidia','ERR',1146),(3609,'Essaouira','ESI',1146),(3610,'Es Smara','ESM',1146),(3611,'Fès','FES',1146),(3612,'Figuig','FIG',1146),(3613,'Guelmim','GUE',1146),(3614,'Ifrane','IFR',1146),(3615,'Jerada','JRA',1146),(3616,'Kelaat Sraghna','KES',1146),(3617,'Kénitra','KEN',1146),(3618,'Khemisaet','KHE',1146),(3619,'Khenifra','KHN',1146),(3620,'Khouribga','KHO',1146),(3621,'Laâyoune (EH)','LAA',1146),(3622,'Larache','LAP',1146),(3623,'Marrakech','MAR',1146),(3624,'Meknsès','MEK',1146),(3625,'Nador','NAD',1146),(3626,'Ouarzazate','OUA',1146),(3627,'Oued ed Dahab (EH)','OUD',1146),(3628,'Oujda','OUJ',1146),(3629,'Rabat-Salé','RBA',1146),(3630,'Safi','SAF',1146),(3631,'Sefrou','SEF',1146),(3632,'Settat','SET',1146),(3633,'Sidl Kacem','SIK',1146),(3634,'Tanger','TNG',1146),(3635,'Tan-Tan','TNT',1146),(3636,'Taounate','TAO',1146),(3637,'Taroudannt','TAR',1146),(3638,'Tata','TAT',1146),(3639,'Taza','TAZ',1146),(3640,'Tétouan','TET',1146),(3641,'Tiznit','TIZ',1146),(3642,'Gagauzia, Unitate Teritoriala Autonoma','GA',1142),(3643,'Chisinau','CU',1142),(3644,'Stinga Nistrului, unitatea teritoriala din','SN',1142),(3645,'Balti','BA',1142),(3646,'Cahul','CA',1142),(3647,'Edinet','ED',1142),(3648,'Lapusna','LA',1142),(3649,'Orhei','OR',1142),(3650,'Soroca','SO',1142),(3651,'Taraclia','TA',1142),(3652,'Tighina [Bender]','TI',1142),(3653,'Ungheni','UN',1142),(3654,'Antananarivo','T',1129),(3655,'Antsiranana','D',1129),(3656,'Fianarantsoa','F',1129),(3657,'Mahajanga','M',1129),(3658,'Toamasina','A',1129),(3659,'Toliara','U',1129),(3660,'Ailinglapalap','ALL',1135),(3661,'Ailuk','ALK',1135),(3662,'Arno','ARN',1135),(3663,'Aur','AUR',1135),(3664,'Ebon','EBO',1135),(3665,'Eniwetok','ENI',1135),(3666,'Jaluit','JAL',1135),(3667,'Kili','KIL',1135),(3668,'Kwajalein','KWA',1135),(3669,'Lae','LAE',1135),(3670,'Lib','LIB',1135),(3671,'Likiep','LIK',1135),(3672,'Majuro','MAJ',1135),(3673,'Maloelap','MAL',1135),(3674,'Mejit','MEJ',1135),(3675,'Mili','MIL',1135),(3676,'Namorik','NMK',1135),(3677,'Namu','NMU',1135),(3678,'Rongelap','RON',1135),(3679,'Ujae','UJA',1135),(3680,'Ujelang','UJL',1135),(3681,'Utirik','UTI',1135),(3682,'Wotho','WTN',1135),(3683,'Wotje','WTJ',1135),(3684,'Bamako','BK0',1133),(3685,'Gao','7',1133),(3686,'Kayes','1',1133),(3687,'Kidal','8',1133),(3688,'Xoulikoro','2',1133),(3689,'Mopti','5',1133),(3690,'S69ou','4',1133),(3691,'Sikasso','3',1133),(3692,'Tombouctou','6',1133),(3693,'Ayeyarwady','07',1035),(3694,'Bago','02',1035),(3695,'Magway','03',1035),(3696,'Mandalay','04',1035),(3697,'Sagaing','01',1035),(3698,'Tanintharyi','05',1035),(3699,'Yangon','06',1035),(3700,'Chin','14',1035),(3701,'Kachin','11',1035),(3702,'Kayah','12',1035),(3703,'Kayin','13',1035),(3704,'Mon','15',1035),(3705,'Rakhine','16',1035),(3706,'Shan','17',1035),(3707,'Ulaanbaatar','1',1144),(3708,'Arhangay','073',1144),(3709,'Bayanhongor','069',1144),(3710,'Bayan-Olgiy','071',1144),(3711,'Bulgan','067',1144),(3712,'Darhan uul','037',1144),(3713,'Dornod','061',1144),(3714,'Dornogov,','063',1144),(3715,'DundgovL','059',1144),(3716,'Dzavhan','057',1144),(3717,'Govi-Altay','065',1144),(3718,'Govi-Smber','064',1144),(3719,'Hentiy','039',1144),(3720,'Hovd','043',1144),(3721,'Hovsgol','041',1144),(3722,'Omnogovi','053',1144),(3723,'Orhon','035',1144),(3724,'Ovorhangay','055',1144),(3725,'Selenge','049',1144),(3726,'Shbaatar','051',1144),(3727,'Tov','047',1144),(3728,'Uvs','046',1144),(3729,'Nouakchott','NKC',1137),(3730,'Assaba','03',1137),(3731,'Brakna','05',1137),(3732,'Dakhlet Nouadhibou','08',1137),(3733,'Gorgol','04',1137),(3734,'Guidimaka','10',1137),(3735,'Hodh ech Chargui','01',1137),(3736,'Hodh el Charbi','02',1137),(3737,'Inchiri','12',1137),(3738,'Tagant','09',1137),(3739,'Tiris Zemmour','11',1137),(3740,'Trarza','06',1137),(3741,'Beau Bassin-Rose Hill','BR',1138),(3742,'Curepipe','CU',1138),(3743,'Port Louis','PU',1138),(3744,'Quatre Bornes','QB',1138),(3745,'Vacosa-Phoenix','VP',1138),(3746,'Black River','BL',1138),(3747,'Flacq','FL',1138),(3748,'Grand Port','GP',1138),(3749,'Moka','MO',1138),(3750,'Pamplemousses','PA',1138),(3751,'Plaines Wilhems','PW',1138),(3752,'Riviere du Rempart','RP',1138),(3753,'Savanne','SA',1138),(3754,'Agalega Islands','AG',1138),(3755,'Cargados Carajos Shoals','CC',1138),(3756,'Rodrigues Island','RO',1138),(3757,'Male','MLE',1132),(3758,'Alif','02',1132),(3759,'Baa','20',1132),(3760,'Dhaalu','17',1132),(3761,'Faafu','14',1132),(3762,'Gaaf Alif','27',1132),(3763,'Gaefu Dhaalu','28',1132),(3764,'Gnaviyani','29',1132),(3765,'Haa Alif','07',1132),(3766,'Haa Dhaalu','23',1132),(3767,'Kaafu','26',1132),(3768,'Laamu','05',1132),(3769,'Lhaviyani','03',1132),(3770,'Meemu','12',1132),(3771,'Noonu','25',1132),(3772,'Raa','13',1132),(3773,'Seenu','01',1132),(3774,'Shaviyani','24',1132),(3775,'Thaa','08',1132),(3776,'Vaavu','04',1132),(3777,'Balaka','BA',1130),(3778,'Blantyre','BL',1130),(3779,'Chikwawa','CK',1130),(3780,'Chiradzulu','CR',1130),(3781,'Chitipa','CT',1130),(3782,'Dedza','DE',1130),(3783,'Dowa','DO',1130),(3784,'Karonga','KR',1130),(3785,'Kasungu','KS',1130),(3786,'Likoma Island','LK',1130),(3787,'Lilongwe','LI',1130),(3788,'Machinga','MH',1130),(3789,'Mangochi','MG',1130),(3790,'Mchinji','MC',1130),(3791,'Mulanje','MU',1130),(3792,'Mwanza','MW',1130),(3793,'Mzimba','MZ',1130),(3794,'Nkhata Bay','NB',1130),(3795,'Nkhotakota','NK',1130),(3796,'Nsanje','NS',1130),(3797,'Ntcheu','NU',1130),(3798,'Ntchisi','NI',1130),(3799,'Phalomba','PH',1130),(3800,'Rumphi','RU',1130),(3801,'Salima','SA',1130),(3802,'Thyolo','TH',1130),(3803,'Zomba','ZO',1130),(3804,'Aguascalientes','AGU',1140),(3805,'Baja California','BCN',1140),(3806,'Baja California Sur','BCS',1140),(3807,'Campeche','CAM',1140),(3808,'Coahuila','COA',1140),(3809,'Colima','COL',1140),(3810,'Chiapas','CHP',1140),(3811,'Chihuahua','CHH',1140),(3812,'Durango','DUR',1140),(3813,'Guanajuato','GUA',1140),(3814,'Guerrero','GRO',1140),(3815,'Hidalgo','HID',1140),(3816,'Jalisco','JAL',1140),(3817,'Mexico','MEX',1140),(3818,'Michoacin','MIC',1140),(3819,'Morelos','MOR',1140),(3820,'Nayarit','NAY',1140),(3821,'Nuevo Leon','NLE',1140),(3822,'Oaxaca','OAX',1140),(3823,'Puebla','PUE',1140),(3824,'Queretaro','QUE',1140),(3825,'Quintana Roo','ROO',1140),(3826,'San Luis Potosi','SLP',1140),(3827,'Sinaloa','SIN',1140),(3828,'Sonora','SON',1140),(3829,'Tabasco','TAB',1140),(3830,'Tamaulipas','TAM',1140),(3831,'Tlaxcala','TLA',1140),(3832,'Veracruz','VER',1140),(3833,'Yucatan','YUC',1140),(3834,'Zacatecas','ZAC',1140),(3835,'Wilayah Persekutuan Kuala Lumpur','14',1131),(3836,'Wilayah Persekutuan Labuan','15',1131),(3837,'Wilayah Persekutuan Putrajaya','16',1131),(3838,'Johor','01',1131),(3839,'Kedah','02',1131),(3840,'Kelantan','03',1131),(3841,'Melaka','04',1131),(3842,'Negeri Sembilan','05',1131),(3843,'Pahang','06',1131),(3844,'Perak','08',1131),(3845,'Perlis','09',1131),(3846,'Pulau Pinang','07',1131),(3847,'Sabah','12',1131),(3848,'Sarawak','13',1131),(3849,'Selangor','10',1131),(3850,'Terengganu','11',1131),(3851,'Maputo','MPM',1147),(3852,'Cabo Delgado','P',1147),(3853,'Gaza','G',1147),(3854,'Inhambane','I',1147),(3855,'Manica','B',1147),(3856,'Numpula','N',1147),(3857,'Niaaea','A',1147),(3858,'Sofala','S',1147),(3859,'Tete','T',1147),(3860,'Zambezia','Q',1147),(3861,'Caprivi','CA',1148),(3862,'Erongo','ER',1148),(3863,'Hardap','HA',1148),(3864,'Karas','KA',1148),(3865,'Khomas','KH',1148),(3866,'Kunene','KU',1148),(3867,'Ohangwena','OW',1148),(3868,'Okavango','OK',1148),(3869,'Omaheke','OH',1148),(3870,'Omusati','OS',1148),(3871,'Oshana','ON',1148),(3872,'Oshikoto','OT',1148),(3873,'Otjozondjupa','OD',1148),(3874,'Niamey','8',1156),(3875,'Agadez','1',1156),(3876,'Diffa','2',1156),(3877,'Dosso','3',1156),(3878,'Maradi','4',1156),(3879,'Tahoua','S',1156),(3880,'Tillaberi','6',1156),(3881,'Zinder','7',1156),(3882,'Abuja Federal Capital Territory','FC',1157),(3883,'Abia','AB',1157),(3884,'Adamawa','AD',1157),(3885,'Akwa Ibom','AK',1157),(3886,'Anambra','AN',1157),(3887,'Bauchi','BA',1157),(3888,'Bayelsa','BY',1157),(3889,'Benue','BE',1157),(3890,'Borno','BO',1157),(3891,'Cross River','CR',1157),(3892,'Delta','DE',1157),(3893,'Ebonyi','EB',1157),(3894,'Edo','ED',1157),(3895,'Ekiti','EK',1157),(3896,'Enugu','EN',1157),(3897,'Gombe','GO',1157),(3898,'Imo','IM',1157),(3899,'Jigawa','JI',1157),(3900,'Kaduna','KD',1157),(3901,'Kano','KN',1157),(3902,'Katsina','KT',1157),(3903,'Kebbi','KE',1157),(3904,'Kogi','KO',1157),(3905,'Kwara','KW',1157),(3906,'Lagos','LA',1157),(3907,'Nassarawa','NA',1157),(3908,'Niger','NI',1157),(3909,'Ogun','OG',1157),(3910,'Ondo','ON',1157),(3911,'Osun','OS',1157),(3912,'Oyo','OY',1157),(3913,'Rivers','RI',1157),(3914,'Sokoto','SO',1157),(3915,'Taraba','TA',1157),(3916,'Yobe','YO',1157),(3917,'Zamfara','ZA',1157),(3918,'Boaco','BO',1155),(3919,'Carazo','CA',1155),(3920,'Chinandega','CI',1155),(3921,'Chontales','CO',1155),(3922,'Esteli','ES',1155),(3923,'Jinotega','JI',1155),(3924,'Leon','LE',1155),(3925,'Madriz','MD',1155),(3926,'Managua','MN',1155),(3927,'Masaya','MS',1155),(3928,'Matagalpa','MT',1155),(3929,'Nueva Segovia','NS',1155),(3930,'Rio San Juan','SJ',1155),(3931,'Rivas','RI',1155),(3932,'Atlantico Norte','AN',1155),(3933,'Atlantico Sur','AS',1155),(3934,'Drente','DR',1152),(3935,'Flevoland','FL',1152),(3936,'Friesland','FR',1152),(3937,'Gelderland','GL',1152),(3938,'Groningen','GR',1152),(3939,'Noord-Brabant','NB',1152),(3940,'Noord-Holland','NH',1152),(3941,'Overijssel','OV',1152),(3942,'Utrecht','UT',1152),(3943,'Zuid-Holland','ZH',1152),(3944,'Zeeland','ZL',1152),(3945,'Akershus','02',1161),(3946,'Aust-Agder','09',1161),(3947,'Buskerud','06',1161),(3948,'Finnmark','20',1161),(3949,'Hedmark','04',1161),(3950,'Hordaland','12',1161),(3951,'Møre og Romsdal','15',1161),(3952,'Nordland','18',1161),(3953,'Nord-Trøndelag','17',1161),(3954,'Oppland','05',1161),(3955,'Oslo','03',1161),(3956,'Rogaland','11',1161),(3957,'Sogn og Fjordane','14',1161),(3958,'Sør-Trøndelag','16',1161),(3959,'Telemark','06',1161),(3960,'Troms','19',1161),(3961,'Vest-Agder','10',1161),(3962,'Vestfold','07',1161),(3963,'Østfold','01',1161),(3964,'Jan Mayen','22',1161),(3965,'Svalbard','21',1161),(3966,'Auckland','AUK',1154),(3967,'Bay of Plenty','BOP',1154),(3968,'Canterbury','CAN',1154),(3969,'Gisborne','GIS',1154),(3970,'Hawkes Bay','HKB',1154),(3971,'Manawatu-Wanganui','MWT',1154),(3972,'Marlborough','MBH',1154),(3973,'Nelson','NSN',1154),(3974,'Northland','NTL',1154),(3975,'Otago','OTA',1154),(3976,'Southland','STL',1154),(3977,'Taranaki','TKI',1154),(3978,'Tasman','TAS',1154),(3979,'Waikato','WKO',1154),(3980,'Wellington','WGN',1154),(3981,'West Coast','WTC',1154),(3982,'Ad Dakhillyah','DA',1162),(3983,'Al Batinah','BA',1162),(3984,'Al Janblyah','JA',1162),(3985,'Al Wusta','WU',1162),(3986,'Ash Sharqlyah','SH',1162),(3987,'Az Zahirah','ZA',1162),(3988,'Masqat','MA',1162),(3989,'Musandam','MU',1162),(3990,'Bocas del Toro','1',1166),(3991,'Cocle','2',1166),(3992,'Chiriqui','4',1166),(3993,'Darien','5',1166),(3994,'Herrera','6',1166),(3995,'Loa Santoa','7',1166),(3996,'Panama','8',1166),(3997,'Veraguas','9',1166),(3998,'Comarca de San Blas','Q',1166),(3999,'El Callao','CAL',1169),(4000,'Ancash','ANC',1169),(4001,'Apurimac','APU',1169),(4002,'Arequipa','ARE',1169),(4003,'Ayacucho','AYA',1169),(4004,'Cajamarca','CAJ',1169),(4005,'Cuzco','CUS',1169),(4006,'Huancavelica','HUV',1169),(4007,'Huanuco','HUC',1169),(4008,'Ica','ICA',1169),(4009,'Junin','JUN',1169),(4010,'La Libertad','LAL',1169),(4011,'Lambayeque','LAM',1169),(4012,'Lima','LIM',1169),(4013,'Loreto','LOR',1169),(4014,'Madre de Dios','MDD',1169),(4015,'Moquegua','MOQ',1169),(4016,'Pasco','PAS',1169),(4017,'Piura','PIU',1169),(4018,'Puno','PUN',1169),(4019,'San Martin','SAM',1169),(4020,'Tacna','TAC',1169),(4021,'Tumbes','TUM',1169),(4022,'Ucayali','UCA',1169),(4023,'National Capital District (Port Moresby)','NCD',1167),(4024,'Chimbu','CPK',1167),(4025,'Eastern Highlands','EHG',1167),(4026,'East New Britain','EBR',1167),(4027,'East Sepik','ESW',1167),(4028,'Enga','EPW',1167),(4029,'Gulf','GPK',1167),(4030,'Madang','MPM',1167),(4031,'Manus','MRL',1167),(4032,'Milne Bay','MBA',1167),(4033,'Morobe','MPL',1167),(4034,'New Ireland','NIK',1167),(4035,'North Solomons','NSA',1167),(4036,'Santaun','SAN',1167),(4037,'Southern Highlands','SHM',1167),(4038,'Western Highlands','WHM',1167),(4039,'West New Britain','WBK',1167),(4040,'Abra','ABR',1170),(4041,'Agusan del Norte','AGN',1170),(4042,'Agusan del Sur','AGS',1170),(4043,'Aklan','AKL',1170),(4044,'Albay','ALB',1170),(4045,'Antique','ANT',1170),(4046,'Apayao','APA',1170),(4047,'Aurora','AUR',1170),(4048,'Basilan','BAS',1170),(4049,'Bataan','BAN',1170),(4050,'Batanes','BTN',1170),(4051,'Batangas','BTG',1170),(4052,'Benguet','BEN',1170),(4053,'Biliran','BIL',1170),(4054,'Bohol','BOH',1170),(4055,'Bukidnon','BUK',1170),(4056,'Bulacan','BUL',1170),(4057,'Cagayan','CAG',1170),(4058,'Camarines Norte','CAN',1170),(4059,'Camarines Sur','CAS',1170),(4060,'Camiguin','CAM',1170),(4061,'Capiz','CAP',1170),(4062,'Catanduanes','CAT',1170),(4063,'Cavite','CAV',1170),(4064,'Cebu','CEB',1170),(4065,'Compostela Valley','COM',1170),(4066,'Davao','DAV',1170),(4067,'Davao del Sur','DAS',1170),(4068,'Davao Oriental','DAO',1170),(4069,'Eastern Samar','EAS',1170),(4070,'Guimaras','GUI',1170),(4071,'Ifugao','IFU',1170),(4072,'Ilocos Norte','ILN',1170),(4073,'Ilocos Sur','ILS',1170),(4074,'Iloilo','ILI',1170),(4075,'Isabela','ISA',1170),(4076,'Kalinga-Apayso','KAL',1170),(4077,'Laguna','LAG',1170),(4078,'Lanao del Norte','LAN',1170),(4079,'Lanao del Sur','LAS',1170),(4080,'La Union','LUN',1170),(4081,'Leyte','LEY',1170),(4082,'Maguindanao','MAG',1170),(4083,'Marinduque','MAD',1170),(4084,'Masbate','MAS',1170),(4085,'Mindoro Occidental','MDC',1170),(4086,'Mindoro Oriental','MDR',1170),(4087,'Misamis Occidental','MSC',1170),(4088,'Misamis Oriental','MSR',1170),(4089,'Mountain Province','MOU',1170),(4090,'Negroe Occidental','NEC',1170),(4091,'Negros Oriental','NER',1170),(4092,'North Cotabato','NCO',1170),(4093,'Northern Samar','NSA',1170),(4094,'Nueva Ecija','NUE',1170),(4095,'Nueva Vizcaya','NUV',1170),(4096,'Palawan','PLW',1170),(4097,'Pampanga','PAM',1170),(4098,'Pangasinan','PAN',1170),(4099,'Quezon','QUE',1170),(4100,'Quirino','QUI',1170),(4101,'Rizal','RIZ',1170),(4102,'Romblon','ROM',1170),(4103,'Sarangani','SAR',1170),(4104,'Siquijor','SIG',1170),(4105,'Sorsogon','SOR',1170),(4106,'South Cotabato','SCO',1170),(4107,'Southern Leyte','SLE',1170),(4108,'Sultan Kudarat','SUK',1170),(4109,'Sulu','SLU',1170),(4110,'Surigao del Norte','SUN',1170),(4111,'Surigao del Sur','SUR',1170),(4112,'Tarlac','TAR',1170),(4113,'Tawi-Tawi','TAW',1170),(4114,'Western Samar','WSA',1170),(4115,'Zambales','ZMB',1170),(4116,'Zamboanga del Norte','ZAN',1170),(4117,'Zamboanga del Sur','ZAS',1170),(4118,'Zamboanga Sibiguey','ZSI',1170),(4119,'Islamabad Federal Capital Area','IS',1163),(4120,'Baluchistan','BA',1163),(4121,'Khyber Pakhtun Khawa','NW',1163),(4122,'Sindh','SD',1163),(4123,'Federally Administered Tribal Areas','TA',1163),(4124,'Azad Kashmir','JK',1163),(4125,'Gilgit-Baltistan','NA',1163),(4126,'Aveiro','01',1173),(4127,'Beja','02',1173),(4128,'Braga','03',1173),(4129,'Braganca','04',1173),(4130,'Castelo Branco','05',1173),(4131,'Colmbra','06',1173),(4132,'Ovora','07',1173),(4133,'Faro','08',1173),(4134,'Guarda','09',1173),(4135,'Leiria','10',1173),(4136,'Lisboa','11',1173),(4137,'Portalegre','12',1173),(4138,'Porto','13',1173),(4139,'Santarem','14',1173),(4140,'Setubal','15',1173),(4141,'Viana do Castelo','16',1173),(4142,'Vila Real','17',1173),(4143,'Viseu','18',1173),(4144,'Regiao Autonoma dos Acores','20',1173),(4145,'Regiao Autonoma da Madeira','30',1173),(4146,'Asuncion','ASU',1168),(4147,'Alto Paraguay','16',1168),(4148,'Alto Parana','10',1168),(4149,'Amambay','13',1168),(4150,'Boqueron','19',1168),(4151,'Caeguazu','5',1168),(4152,'Caazapl','6',1168),(4153,'Canindeyu','14',1168),(4154,'Concepcion','1',1168),(4155,'Cordillera','3',1168),(4156,'Guaira','4',1168),(4157,'Itapua','7',1168),(4158,'Miaiones','8',1168),(4159,'Neembucu','12',1168),(4160,'Paraguari','9',1168),(4161,'Presidente Hayes','15',1168),(4162,'San Pedro','2',1168),(4163,'Ad Dawhah','DA',1175),(4164,'Al Ghuwayriyah','GH',1175),(4165,'Al Jumayliyah','JU',1175),(4166,'Al Khawr','KH',1175),(4167,'Al Wakrah','WA',1175),(4168,'Ar Rayyan','RA',1175),(4169,'Jariyan al Batnah','JB',1175),(4170,'Madinat ash Shamal','MS',1175),(4171,'Umm Salal','US',1175),(4172,'Bucuresti','B',1176),(4173,'Alba','AB',1176),(4174,'Arad','AR',1176),(4175,'Arges','AG',1176),(4176,'Bacau','BC',1176),(4177,'Bihor','BH',1176),(4178,'Bistrita-Nasaud','BN',1176),(4179,'Boto\'ani','BT',1176),(4180,'Bra\'ov','BV',1176),(4181,'Braila','BR',1176),(4182,'Buzau','BZ',1176),(4183,'Caras-Severin','CS',1176),(4184,'Ca la ras\'i','CL',1176),(4185,'Cluj','CJ',1176),(4186,'Constant\'a','CT',1176),(4187,'Covasna','CV',1176),(4188,'Dambovit\'a','DB',1176),(4189,'Dolj','DJ',1176),(4190,'Galat\'i','GL',1176),(4191,'Giurgiu','GR',1176),(4192,'Gorj','GJ',1176),(4193,'Harghita','HR',1176),(4194,'Hunedoara','HD',1176),(4195,'Ialomit\'a','IL',1176),(4196,'Ias\'i','IS',1176),(4197,'Ilfov','IF',1176),(4198,'Maramures','MM',1176),(4199,'Mehedint\'i','MH',1176),(4200,'Mures','MS',1176),(4201,'Neamt','NT',1176),(4202,'Olt','OT',1176),(4203,'Prahova','PH',1176),(4204,'Satu Mare','SM',1176),(4205,'Sa laj','SJ',1176),(4206,'Sibiu','SB',1176),(4207,'Suceava','SV',1176),(4208,'Teleorman','TR',1176),(4209,'Timis','TM',1176),(4210,'Tulcea','TL',1176),(4211,'Vaslui','VS',1176),(4212,'Valcea','VL',1176),(4213,'Vrancea','VN',1176),(4214,'Adygeya, Respublika','AD',1177),(4215,'Altay, Respublika','AL',1177),(4216,'Bashkortostan, Respublika','BA',1177),(4217,'Buryatiya, Respublika','BU',1177),(4218,'Chechenskaya Respublika','CE',1177),(4219,'Chuvashskaya Respublika','CU',1177),(4220,'Dagestan, Respublika','DA',1177),(4221,'Ingushskaya Respublika','IN',1177),(4222,'Kabardino-Balkarskaya','KB',1177),(4223,'Kalmykiya, Respublika','KL',1177),(4224,'Karachayevo-Cherkesskaya Respublika','KC',1177),(4225,'Kareliya, Respublika','KR',1177),(4226,'Khakasiya, Respublika','KK',1177),(4227,'Komi, Respublika','KO',1177),(4228,'Mariy El, Respublika','ME',1177),(4229,'Mordoviya, Respublika','MO',1177),(4230,'Sakha, Respublika [Yakutiya]','SA',1177),(4231,'Severnaya Osetiya, Respublika','SE',1177),(4232,'Tatarstan, Respublika','TA',1177),(4233,'Tyva, Respublika [Tuva]','TY',1177),(4234,'Udmurtskaya Respublika','UD',1177),(4235,'Altayskiy kray','ALT',1177),(4236,'Khabarovskiy kray','KHA',1177),(4237,'Krasnodarskiy kray','KDA',1177),(4238,'Krasnoyarskiy kray','KYA',1177),(4239,'Primorskiy kray','PRI',1177),(4240,'Stavropol\'skiy kray','STA',1177),(4241,'Amurskaya oblast\'','AMU',1177),(4242,'Arkhangel\'skaya oblast\'','ARK',1177),(4243,'Astrakhanskaya oblast\'','AST',1177),(4244,'Belgorodskaya oblast\'','BEL',1177),(4245,'Bryanskaya oblast\'','BRY',1177),(4246,'Chelyabinskaya oblast\'','CHE',1177),(4247,'Zabaykalsky Krai\'','ZSK',1177),(4248,'Irkutskaya oblast\'','IRK',1177),(4249,'Ivanovskaya oblast\'','IVA',1177),(4250,'Kaliningradskaya oblast\'','KGD',1177),(4251,'Kaluzhskaya oblast\'','KLU',1177),(4252,'Kamchatka Krai\'','KAM',1177),(4253,'Kemerovskaya oblast\'','KEM',1177),(4254,'Kirovskaya oblast\'','KIR',1177),(4255,'Kostromskaya oblast\'','KOS',1177),(4256,'Kurganskaya oblast\'','KGN',1177),(4257,'Kurskaya oblast\'','KRS',1177),(4258,'Leningradskaya oblast\'','LEN',1177),(4259,'Lipetskaya oblast\'','LIP',1177),(4260,'Magadanskaya oblast\'','MAG',1177),(4261,'Moskovskaya oblast\'','MOS',1177),(4262,'Murmanskaya oblast\'','MUR',1177),(4263,'Nizhegorodskaya oblast\'','NIZ',1177),(4264,'Novgorodskaya oblast\'','NGR',1177),(4265,'Novosibirskaya oblast\'','NVS',1177),(4266,'Omskaya oblast\'','OMS',1177),(4267,'Orenburgskaya oblast\'','ORE',1177),(4268,'Orlovskaya oblast\'','ORL',1177),(4269,'Penzenskaya oblast\'','PNZ',1177),(4270,'Perm krai\'','PEK',1177),(4271,'Pskovskaya oblast\'','PSK',1177),(4272,'Rostovskaya oblast\'','ROS',1177),(4273,'Ryazanskaya oblast\'','RYA',1177),(4274,'Sakhalinskaya oblast\'','SAK',1177),(4275,'Samarskaya oblast\'','SAM',1177),(4276,'Saratovskaya oblast\'','SAR',1177),(4277,'Smolenskaya oblast\'','SMO',1177),(4278,'Sverdlovskaya oblast\'','SVE',1177),(4279,'Tambovskaya oblast\'','TAM',1177),(4280,'Tomskaya oblast\'','TOM',1177),(4281,'Tul\'skaya oblast\'','TUL',1177),(4282,'Tverskaya oblast\'','TVE',1177),(4283,'Tyumenskaya oblast\'','TYU',1177),(4284,'Ul\'yanovskaya oblast\'','ULY',1177),(4285,'Vladimirskaya oblast\'','VLA',1177),(4286,'Volgogradskaya oblast\'','VGG',1177),(4287,'Vologodskaya oblast\'','VLG',1177),(4288,'Voronezhskaya oblast\'','VOR',1177),(4289,'Yaroslavskaya oblast\'','YAR',1177),(4290,'Moskva','MOW',1177),(4291,'Sankt-Peterburg','SPE',1177),(4292,'Yevreyskaya avtonomnaya oblast\'','YEV',1177),(4294,'Chukotskiy avtonomnyy okrug','CHU',1177),(4296,'Khanty-Mansiyskiy avtonomnyy okrug','KHM',1177),(4299,'Nenetskiy avtonomnyy okrug','NEN',1177),(4302,'Yamalo-Nenetskiy avtonomnyy okrug','YAN',1177),(4303,'Butare','C',1178),(4304,'Byumba','I',1178),(4305,'Cyangugu','E',1178),(4306,'Gikongoro','D',1178),(4307,'Gisenyi','G',1178),(4308,'Gitarama','B',1178),(4309,'Kibungo','J',1178),(4310,'Kibuye','F',1178),(4311,'Kigali-Rural Kigali y\' Icyaro','K',1178),(4312,'Kigali-Ville Kigali Ngari','L',1178),(4313,'Mutara','M',1178),(4314,'Ruhengeri','H',1178),(4315,'Al Bahah','11',1187),(4316,'Al Hudud Ash Shamaliyah','08',1187),(4317,'Al Jawf','12',1187),(4318,'Al Madinah','03',1187),(4319,'Al Qasim','05',1187),(4320,'Ar Riyad','01',1187),(4321,'Asir','14',1187),(4322,'Ha\'il','06',1187),(4323,'Jlzan','09',1187),(4324,'Makkah','02',1187),(4325,'Najran','10',1187),(4326,'Tabuk','07',1187),(4327,'Capital Territory (Honiara)','CT',1194),(4328,'Guadalcanal','GU',1194),(4329,'Isabel','IS',1194),(4330,'Makira','MK',1194),(4331,'Malaita','ML',1194),(4332,'Temotu','TE',1194),(4333,'A\'ali an Nil','23',1200),(4334,'Al Bah al Ahmar','26',1200),(4335,'Al Buhayrat','18',1200),(4336,'Al Jazirah','07',1200),(4337,'Al Khartum','03',1200),(4338,'Al Qadarif','06',1200),(4339,'Al Wahdah','22',1200),(4340,'An Nil','04',1200),(4341,'An Nil al Abyaq','08',1200),(4342,'An Nil al Azraq','24',1200),(4343,'Ash Shamallyah','01',1200),(4344,'Bahr al Jabal','17',1200),(4345,'Gharb al Istiwa\'iyah','16',1200),(4346,'Gharb Ba~r al Ghazal','14',1200),(4347,'Gharb Darfur','12',1200),(4348,'Gharb Kurdufan','10',1200),(4349,'Janub Darfur','11',1200),(4350,'Janub Rurdufan','13',1200),(4351,'Jnqall','20',1200),(4352,'Kassala','05',1200),(4353,'Shamal Batr al Ghazal','15',1200),(4354,'Shamal Darfur','02',1200),(4355,'Shamal Kurdufan','09',1200),(4356,'Sharq al Istiwa\'iyah','19',1200),(4357,'Sinnar','25',1200),(4358,'Warab','21',1200),(4359,'Blekinge län','K',1204),(4360,'Dalarnas län','W',1204),(4361,'Gotlands län','I',1204),(4362,'Gävleborgs län','X',1204),(4363,'Hallands län','N',1204),(4364,'Jämtlands län','Z',1204),(4365,'Jönkopings län','F',1204),(4366,'Kalmar län','H',1204),(4367,'Kronobergs län','G',1204),(4368,'Norrbottens län','BD',1204),(4369,'SkÃ¥ne län','M',1204),(4370,'Stockholms län','AB',1204),(4371,'Södermanlands län','D',1204),(4372,'Uppsala län','C',1204),(4373,'Värmlands län','S',1204),(4374,'Västerbottens län','AC',1204),(4375,'Västernorrlands län','Y',1204),(4376,'Västmanlands län','U',1204),(4377,'Västra Götalands län','Q',1204),(4378,'Örebro län','T',1204),(4379,'Östergötlands län','E',1204),(4380,'Saint Helena','SH',1180),(4381,'Ascension','AC',1180),(4382,'Tristan da Cunha','TA',1180),(4383,'AjdovÅ¡Äina','001',1193),(4384,'Beltinci','002',1193),(4385,'Benedikt','148',1193),(4386,'Bistrica ob Sotli','149',1193),(4387,'Bled','003',1193),(4388,'Bloke','150',1193),(4389,'Bohinj','004',1193),(4390,'Borovnica','005',1193),(4391,'Bovec','006',1193),(4392,'BraslovÄe','151',1193),(4393,'Brda','007',1193),(4394,'Brezovica','008',1193),(4395,'Brežice','009',1193),(4396,'Cankova','152',1193),(4397,'Celje','011',1193),(4398,'Cerklje na Gorenjskem','012',1193),(4399,'Cerknica','013',1193),(4400,'Cerkno','014',1193),(4401,'Cerkvenjak','153',1193),(4402,'ÄŒrenÅ¡ovci','015',1193),(4403,'ÄŒrna na KoroÅ¡kem','016',1193),(4404,'ÄŒrnomelj','017',1193),(4405,'Destrnik','018',1193),(4406,'DivaÄa','019',1193),(4407,'Dobje','154',1193),(4408,'Dobrepolje','020',1193),(4409,'Dobrna','155',1193),(4410,'Dobrova-Polhov Gradec','021',1193),(4411,'Dobrovnik','156',1193),(4412,'Dol pri Ljubljani','022',1193),(4413,'Dolenjske Toplice','157',1193),(4414,'Domžale','023',1193),(4415,'Dornava','024',1193),(4416,'Dravograd','025',1193),(4417,'Duplek','026',1193),(4418,'Gorenja vas-Poljane','027',1193),(4419,'GoriÅ¡nica','028',1193),(4420,'Gornja Radgona','029',1193),(4421,'Gornji Grad','030',1193),(4422,'Gornji Petrovci','031',1193),(4423,'Grad','158',1193),(4424,'Grosuplje','032',1193),(4425,'Hajdina','159',1193),(4426,'HoÄe-Slivnica','160',1193),(4427,'HodoÅ¡','161',1193),(4428,'Horjul','162',1193),(4429,'Hrastnik','034',1193),(4430,'Hrpelje-Kozina','035',1193),(4431,'Idrija','036',1193),(4432,'Ig','037',1193),(4433,'Ilirska Bistrica','038',1193),(4434,'IvanÄna Gorica','039',1193),(4435,'Izola','040',1193),(4436,'Jesenice','041',1193),(4437,'Jezersko','163',1193),(4438,'JurÅ¡inci','042',1193),(4439,'Kamnik','043',1193),(4440,'Kanal','044',1193),(4441,'KidriÄevo','045',1193),(4442,'Kobarid','046',1193),(4443,'Kobilje','047',1193),(4444,'KoÄevje','048',1193),(4445,'Komen','049',1193),(4446,'Komenda','164',1193),(4447,'Koper','050',1193),(4448,'Kostel','165',1193),(4449,'Kozje','051',1193),(4450,'Kranj','052',1193),(4451,'Kranjska Gora','053',1193),(4452,'Križevci','166',1193),(4453,'KrÅ¡ko','054',1193),(4454,'Kungota','055',1193),(4455,'Kuzma','056',1193),(4456,'LaÅ¡ko','057',1193),(4457,'Lenart','058',1193),(4458,'Lendava','059',1193),(4459,'Litija','060',1193),(4460,'Ljubljana','061',1193),(4461,'Ljubno','062',1193),(4462,'Ljutomer','063',1193),(4463,'Logatec','064',1193),(4464,'LoÅ¡ka dolina','065',1193),(4465,'LoÅ¡ki Potok','066',1193),(4466,'Lovrenc na Pohorju','167',1193),(4467,'LuÄe','067',1193),(4468,'Lukovica','068',1193),(4469,'MajÅ¡perk','069',1193),(4470,'Maribor','070',1193),(4471,'Markovci','168',1193),(4472,'Medvode','071',1193),(4473,'MengeÅ¡','072',1193),(4474,'Metlika','073',1193),(4475,'Mežica','074',1193),(4476,'Miklavž na Dravskem polju','169',1193),(4477,'Miren-Kostanjevica','075',1193),(4478,'Mirna PeÄ','170',1193),(4479,'Mislinja','076',1193),(4480,'MoravÄe','077',1193),(4481,'Moravske Toplice','078',1193),(4482,'Mozirje','079',1193),(4483,'Murska Sobota','080',1193),(4484,'Muta','081',1193),(4485,'Naklo','082',1193),(4486,'Nazarje','083',1193),(4487,'Nova Gorica','084',1193),(4488,'Novo mesto','085',1193),(4489,'Sveta Ana','181',1193),(4490,'Sveti Andraž v Slovenskih goricah','182',1193),(4491,'Sveti Jurij','116',1193),(4492,'Å alovci','033',1193),(4493,'Å empeter-Vrtojba','183',1193),(4494,'Å enÄur','117',1193),(4495,'Å entilj','118',1193),(4496,'Å entjernej','119',1193),(4497,'Å entjur','120',1193),(4498,'Å kocjan','121',1193),(4499,'Å kofja Loka','122',1193),(4500,'Å kofljica','123',1193),(4501,'Å marje pri JelÅ¡ah','124',1193),(4502,'Å martno ob Paki','125',1193),(4503,'Å martno pri Litiji','194',1193),(4504,'Å oÅ¡tanj','126',1193),(4505,'Å tore','127',1193),(4506,'Tabor','184',1193),(4507,'TiÅ¡ina','010',1193),(4508,'Tolmin','128',1193),(4509,'Trbovlje','129',1193),(4510,'Trebnje','130',1193),(4511,'Trnovska vas','185',1193),(4512,'TržiÄ','131',1193),(4513,'Trzin','186',1193),(4514,'TurniÅ¡Äe','132',1193),(4515,'Velenje','133',1193),(4516,'Velika Polana','187',1193),(4517,'Velike LaÅ¡Äe','134',1193),(4518,'Veržej','188',1193),(4519,'Videm','135',1193),(4520,'Vipava','136',1193),(4521,'Vitanje','137',1193),(4522,'Vojnik','138',1193),(4523,'Vransko','189',1193),(4524,'Vrhnika','140',1193),(4525,'Vuzenica','141',1193),(4526,'Zagorje ob Savi','142',1193),(4527,'ZavrÄ','143',1193),(4528,'ZreÄe','144',1193),(4529,'Žalec','190',1193),(4530,'Železniki','146',1193),(4531,'Žetale','191',1193),(4532,'Žiri','147',1193),(4533,'Žirovnica','192',1193),(4534,'Žužemberk','193',1193),(4535,'Banskobystrický kraj','BC',1192),(4536,'Bratislavský kraj','BL',1192),(4537,'KoÅ¡ický kraj','KI',1192),(4538,'Nitriansky kraj','NJ',1192),(4539,'PreÅ¡ovský kraj','PV',1192),(4540,'TrenÄiansky kraj','TC',1192),(4541,'Trnavský kraj','TA',1192),(4542,'Žilinský kraj','ZI',1192),(4543,'Western Area (Freetown)','W',1190),(4544,'Dakar','DK',1188),(4545,'Diourbel','DB',1188),(4546,'Fatick','FK',1188),(4547,'Kaolack','KL',1188),(4548,'Kolda','KD',1188),(4549,'Louga','LG',1188),(4550,'Matam','MT',1188),(4551,'Saint-Louis','SL',1188),(4552,'Tambacounda','TC',1188),(4553,'Thies','TH',1188),(4554,'Ziguinchor','ZG',1188),(4555,'Awdal','AW',1195),(4556,'Bakool','BK',1195),(4557,'Banaadir','BN',1195),(4558,'Bay','BY',1195),(4559,'Galguduud','GA',1195),(4560,'Gedo','GE',1195),(4561,'Hiirsan','HI',1195),(4562,'Jubbada Dhexe','JD',1195),(4563,'Jubbada Hoose','JH',1195),(4564,'Mudug','MU',1195),(4565,'Nugaal','NU',1195),(4566,'Saneag','SA',1195),(4567,'Shabeellaha Dhexe','SD',1195),(4568,'Shabeellaha Hoose','SH',1195),(4569,'Sool','SO',1195),(4570,'Togdheer','TO',1195),(4571,'Woqooyi Galbeed','WO',1195),(4572,'Brokopondo','BR',1201),(4573,'Commewijne','CM',1201),(4574,'Coronie','CR',1201),(4575,'Marowijne','MA',1201),(4576,'Nickerie','NI',1201),(4577,'Paramaribo','PM',1201),(4578,'Saramacca','SA',1201),(4579,'Sipaliwini','SI',1201),(4580,'Wanica','WA',1201),(4581,'Principe','P',1207),(4582,'Sao Tome','S',1207),(4583,'Ahuachapan','AH',1066),(4584,'Cabanas','CA',1066),(4585,'Cuscatlan','CU',1066),(4586,'Chalatenango','CH',1066),(4587,'Morazan','MO',1066),(4588,'San Miguel','SM',1066),(4589,'San Salvador','SS',1066),(4590,'Santa Ana','SA',1066),(4591,'San Vicente','SV',1066),(4592,'Sonsonate','SO',1066),(4593,'Usulutan','US',1066),(4594,'Al Hasakah','HA',1206),(4595,'Al Ladhiqiyah','LA',1206),(4596,'Al Qunaytirah','QU',1206),(4597,'Ar Raqqah','RA',1206),(4598,'As Suwayda\'','SU',1206),(4599,'Dar\'a','DR',1206),(4600,'Dayr az Zawr','DY',1206),(4601,'Dimashq','DI',1206),(4602,'Halab','HL',1206),(4603,'Hamah','HM',1206),(4604,'Jim\'','HI',1206),(4605,'Idlib','ID',1206),(4606,'Rif Dimashq','RD',1206),(4607,'Tarts','TA',1206),(4608,'Hhohho','HH',1203),(4609,'Lubombo','LU',1203),(4610,'Manzini','MA',1203),(4611,'Shiselweni','SH',1203),(4612,'Batha','BA',1043),(4613,'Biltine','BI',1043),(4614,'Borkou-Ennedi-Tibesti','BET',1043),(4615,'Chari-Baguirmi','CB',1043),(4616,'Guera','GR',1043),(4617,'Kanem','KA',1043),(4618,'Lac','LC',1043),(4619,'Logone-Occidental','LO',1043),(4620,'Logone-Oriental','LR',1043),(4621,'Mayo-Kebbi','MK',1043),(4622,'Moyen-Chari','MC',1043),(4623,'Ouaddai','OD',1043),(4624,'Salamat','SA',1043),(4625,'Tandjile','TA',1043),(4626,'Kara','K',1214),(4627,'Maritime (Region)','M',1214),(4628,'Savannes','S',1214),(4629,'Krung Thep Maha Nakhon Bangkok','10',1211),(4630,'Phatthaya','S',1211),(4631,'Amnat Charoen','37',1211),(4632,'Ang Thong','15',1211),(4633,'Buri Ram','31',1211),(4634,'Chachoengsao','24',1211),(4635,'Chai Nat','18',1211),(4636,'Chaiyaphum','36',1211),(4637,'Chanthaburi','22',1211),(4638,'Chiang Mai','50',1211),(4639,'Chiang Rai','57',1211),(4640,'Chon Buri','20',1211),(4641,'Chumphon','86',1211),(4642,'Kalasin','46',1211),(4643,'Kamphasng Phet','62',1211),(4644,'Kanchanaburi','71',1211),(4645,'Khon Kaen','40',1211),(4646,'Krabi','81',1211),(4647,'Lampang','52',1211),(4648,'Lamphun','51',1211),(4649,'Loei','42',1211),(4650,'Lop Buri','16',1211),(4651,'Mae Hong Son','58',1211),(4652,'Maha Sarakham','44',1211),(4653,'Mukdahan','49',1211),(4654,'Nakhon Nayok','26',1211),(4655,'Nakhon Pathom','73',1211),(4656,'Nakhon Phanom','48',1211),(4657,'Nakhon Ratchasima','30',1211),(4658,'Nakhon Sawan','60',1211),(4659,'Nakhon Si Thammarat','80',1211),(4660,'Nan','55',1211),(4661,'Narathiwat','96',1211),(4662,'Nong Bua Lam Phu','39',1211),(4663,'Nong Khai','43',1211),(4664,'Nonthaburi','12',1211),(4665,'Pathum Thani','13',1211),(4666,'Pattani','94',1211),(4667,'Phangnga','82',1211),(4668,'Phatthalung','93',1211),(4669,'Phayao','56',1211),(4670,'Phetchabun','67',1211),(4671,'Phetchaburi','76',1211),(4672,'Phichit','66',1211),(4673,'Phitsanulok','65',1211),(4674,'Phrae','54',1211),(4675,'Phra Nakhon Si Ayutthaya','14',1211),(4676,'Phuket','83',1211),(4677,'Prachin Buri','25',1211),(4678,'Prachuap Khiri Khan','77',1211),(4679,'Ranong','85',1211),(4680,'Ratchaburi','70',1211),(4681,'Rayong','21',1211),(4682,'Roi Et','45',1211),(4683,'Sa Kaeo','27',1211),(4684,'Sakon Nakhon','47',1211),(4685,'Samut Prakan','11',1211),(4686,'Samut Sakhon','74',1211),(4687,'Samut Songkhram','75',1211),(4688,'Saraburi','19',1211),(4689,'Satun','91',1211),(4690,'Sing Buri','17',1211),(4691,'Si Sa Ket','33',1211),(4692,'Songkhla','90',1211),(4693,'Sukhothai','64',1211),(4694,'Suphan Buri','72',1211),(4695,'Surat Thani','84',1211),(4696,'Surin','32',1211),(4697,'Tak','63',1211),(4698,'Trang','92',1211),(4699,'Trat','23',1211),(4700,'Ubon Ratchathani','34',1211),(4701,'Udon Thani','41',1211),(4702,'Uthai Thani','61',1211),(4703,'Uttaradit','53',1211),(4704,'Yala','95',1211),(4705,'Yasothon','35',1211),(4706,'Sughd','SU',1209),(4707,'Khatlon','KT',1209),(4708,'Gorno-Badakhshan','GB',1209),(4709,'Ahal','A',1220),(4710,'Balkan','B',1220),(4711,'Dasoguz','D',1220),(4712,'Lebap','L',1220),(4713,'Mary','M',1220),(4714,'Béja','31',1218),(4715,'Ben Arous','13',1218),(4716,'Bizerte','23',1218),(4717,'Gabès','81',1218),(4718,'Gafsa','71',1218),(4719,'Jendouba','32',1218),(4720,'Kairouan','41',1218),(4721,'Rasserine','42',1218),(4722,'Kebili','73',1218),(4723,'L\'Ariana','12',1218),(4724,'Le Ref','33',1218),(4725,'Mahdia','53',1218),(4726,'La Manouba','14',1218),(4727,'Medenine','82',1218),(4728,'Moneatir','52',1218),(4729,'Naboul','21',1218),(4730,'Sfax','61',1218),(4731,'Sidi Bouxid','43',1218),(4732,'Siliana','34',1218),(4733,'Sousse','51',1218),(4734,'Tataouine','83',1218),(4735,'Tozeur','72',1218),(4736,'Tunis','11',1218),(4737,'Zaghouan','22',1218),(4738,'Adana','01',1219),(4739,'Ad yaman','02',1219),(4740,'Afyon','03',1219),(4741,'Ag r','04',1219),(4742,'Aksaray','68',1219),(4743,'Amasya','05',1219),(4744,'Ankara','06',1219),(4745,'Antalya','07',1219),(4746,'Ardahan','75',1219),(4747,'Artvin','08',1219),(4748,'Aydin','09',1219),(4749,'Bal kesir','10',1219),(4750,'Bartin','74',1219),(4751,'Batman','72',1219),(4752,'Bayburt','69',1219),(4753,'Bilecik','11',1219),(4754,'Bingol','12',1219),(4755,'Bitlis','13',1219),(4756,'Bolu','14',1219),(4757,'Burdur','15',1219),(4758,'Bursa','16',1219),(4759,'Canakkale','17',1219),(4760,'Cankir','18',1219),(4761,'Corum','19',1219),(4762,'Denizli','20',1219),(4763,'Diyarbakir','21',1219),(4764,'Duzce','81',1219),(4765,'Edirne','22',1219),(4766,'Elazig','23',1219),(4767,'Erzincan','24',1219),(4768,'Erzurum','25',1219),(4769,'Eskis\'ehir','26',1219),(4770,'Gaziantep','27',1219),(4771,'Giresun','28',1219),(4772,'Gms\'hane','29',1219),(4773,'Hakkari','30',1219),(4774,'Hatay','31',1219),(4775,'Igidir','76',1219),(4776,'Isparta','32',1219),(4777,'Icel','33',1219),(4778,'Istanbul','34',1219),(4779,'Izmir','35',1219),(4780,'Kahramanmaras','46',1219),(4781,'Karabk','78',1219),(4782,'Karaman','70',1219),(4783,'Kars','36',1219),(4784,'Kastamonu','37',1219),(4785,'Kayseri','38',1219),(4786,'Kirikkale','71',1219),(4787,'Kirklareli','39',1219),(4788,'Kirs\'ehir','40',1219),(4789,'Kilis','79',1219),(4790,'Kocaeli','41',1219),(4791,'Konya','42',1219),(4792,'Ktahya','43',1219),(4793,'Malatya','44',1219),(4794,'Manisa','45',1219),(4795,'Mardin','47',1219),(4796,'Mugila','48',1219),(4797,'Mus','49',1219),(4798,'Nevs\'ehir','50',1219),(4799,'Nigide','51',1219),(4800,'Ordu','52',1219),(4801,'Osmaniye','80',1219),(4802,'Rize','53',1219),(4803,'Sakarya','54',1219),(4804,'Samsun','55',1219),(4805,'Siirt','56',1219),(4806,'Sinop','57',1219),(4807,'Sivas','58',1219),(4808,'S\'anliurfa','63',1219),(4809,'S\'rnak','73',1219),(4810,'Tekirdag','59',1219),(4811,'Tokat','60',1219),(4812,'Trabzon','61',1219),(4813,'Tunceli','62',1219),(4814,'Us\'ak','64',1219),(4815,'Van','65',1219),(4816,'Yalova','77',1219),(4817,'Yozgat','66',1219),(4818,'Zonguldak','67',1219),(4819,'Couva-Tabaquite-Talparo','CTT',1217),(4820,'Diego Martin','DMN',1217),(4821,'Eastern Tobago','ETO',1217),(4822,'Penal-Debe','PED',1217),(4823,'Princes Town','PRT',1217),(4824,'Rio Claro-Mayaro','RCM',1217),(4825,'Sangre Grande','SGE',1217),(4826,'San Juan-Laventille','SJL',1217),(4827,'Siparia','SIP',1217),(4828,'Tunapuna-Piarco','TUP',1217),(4829,'Western Tobago','WTO',1217),(4830,'Arima','ARI',1217),(4831,'Chaguanas','CHA',1217),(4832,'Point Fortin','PTF',1217),(4833,'Port of Spain','POS',1217),(4834,'San Fernando','SFO',1217),(4835,'Aileu','AL',1063),(4836,'Ainaro','AN',1063),(4837,'Bacucau','BA',1063),(4838,'Bobonaro','BO',1063),(4839,'Cova Lima','CO',1063),(4840,'Dili','DI',1063),(4841,'Ermera','ER',1063),(4842,'Laulem','LA',1063),(4843,'Liquica','LI',1063),(4844,'Manatuto','MT',1063),(4845,'Manafahi','MF',1063),(4846,'Oecussi','OE',1063),(4847,'Viqueque','VI',1063),(4848,'Changhua County','CHA',1208),(4849,'Chiayi County','CYQ',1208),(4850,'Hsinchu County','HSQ',1208),(4851,'Hualien County','HUA',1208),(4852,'Ilan County','ILA',1208),(4853,'Kaohsiung County','KHQ',1208),(4854,'Miaoli County','MIA',1208),(4855,'Nantou County','NAN',1208),(4856,'Penghu County','PEN',1208),(4857,'Pingtung County','PIF',1208),(4858,'Taichung County','TXQ',1208),(4859,'Tainan County','TNQ',1208),(4860,'Taipei County','TPQ',1208),(4861,'Taitung County','TTT',1208),(4862,'Taoyuan County','TAO',1208),(4863,'Yunlin Conuty','YUN',1208),(4864,'Keelung City','KEE',1208),(4865,'Arusha','01',1210),(4866,'Dar-es-Salaam','02',1210),(4867,'Dodoma','03',1210),(4868,'Iringa','04',1210),(4869,'Kagera','05',1210),(4870,'Kaskazini Pemba','06',1210),(4871,'Kaskazini Unguja','07',1210),(4872,'Xigoma','08',1210),(4873,'Kilimanjaro','09',1210),(4874,'Rusini Pemba','10',1210),(4875,'Kusini Unguja','11',1210),(4876,'Lindi','12',1210),(4877,'Manyara','26',1210),(4878,'Mara','13',1210),(4879,'Mbeya','14',1210),(4880,'Mjini Magharibi','15',1210),(4881,'Morogoro','16',1210),(4882,'Mtwara','17',1210),(4883,'Pwani','19',1210),(4884,'Rukwa','20',1210),(4885,'Ruvuma','21',1210),(4886,'Shinyanga','22',1210),(4887,'Singida','23',1210),(4888,'Tabora','24',1210),(4889,'Tanga','25',1210),(4890,'Cherkas\'ka Oblast\'','71',1224),(4891,'Chernihivs\'ka Oblast\'','74',1224),(4892,'Chernivets\'ka Oblast\'','77',1224),(4893,'Dnipropetrovs\'ka Oblast\'','12',1224),(4894,'Donets\'ka Oblast\'','14',1224),(4895,'Ivano-Frankivs\'ka Oblast\'','26',1224),(4896,'Kharkivs\'ka Oblast\'','63',1224),(4897,'Khersons\'ka Oblast\'','65',1224),(4898,'Khmel\'nyts\'ka Oblast\'','68',1224),(4899,'Kirovohrads\'ka Oblast\'','35',1224),(4900,'Kyivs\'ka Oblast\'','32',1224),(4901,'Luhans\'ka Oblast\'','09',1224),(4902,'L\'vivs\'ka Oblast\'','46',1224),(4903,'Mykolaivs\'ka Oblast\'','48',1224),(4904,'Odes \'ka Oblast\'','51',1224),(4905,'Poltavs\'ka Oblast\'','53',1224),(4906,'Rivnens\'ka Oblast\'','56',1224),(4907,'Sums \'ka Oblast\'','59',1224),(4908,'Ternopil\'s\'ka Oblast\'','61',1224),(4909,'Vinnyts\'ka Oblast\'','05',1224),(4910,'Volyos\'ka Oblast\'','07',1224),(4911,'Zakarpats\'ka Oblast\'','21',1224),(4912,'Zaporiz\'ka Oblast\'','23',1224),(4913,'Zhytomyrs\'ka Oblast\'','18',1224),(4914,'Respublika Krym','43',1224),(4915,'Kyiv','30',1224),(4916,'Sevastopol','40',1224),(4917,'Adjumani','301',1223),(4918,'Apac','302',1223),(4919,'Arua','303',1223),(4920,'Bugiri','201',1223),(4921,'Bundibugyo','401',1223),(4922,'Bushenyi','402',1223),(4923,'Busia','202',1223),(4924,'Gulu','304',1223),(4925,'Hoima','403',1223),(4926,'Iganga','203',1223),(4927,'Jinja','204',1223),(4928,'Kabale','404',1223),(4929,'Kabarole','405',1223),(4930,'Kaberamaido','213',1223),(4931,'Kalangala','101',1223),(4932,'Kampala','102',1223),(4933,'Kamuli','205',1223),(4934,'Kamwenge','413',1223),(4935,'Kanungu','414',1223),(4936,'Kapchorwa','206',1223),(4937,'Kasese','406',1223),(4938,'Katakwi','207',1223),(4939,'Kayunga','112',1223),(4940,'Kibaale','407',1223),(4941,'Kiboga','103',1223),(4942,'Kisoro','408',1223),(4943,'Kitgum','305',1223),(4944,'Kotido','306',1223),(4945,'Kumi','208',1223),(4946,'Kyenjojo','415',1223),(4947,'Lira','307',1223),(4948,'Luwero','104',1223),(4949,'Masaka','105',1223),(4950,'Masindi','409',1223),(4951,'Mayuge','214',1223),(4952,'Mbale','209',1223),(4953,'Mbarara','410',1223),(4954,'Moroto','308',1223),(4955,'Moyo','309',1223),(4956,'Mpigi','106',1223),(4957,'Mubende','107',1223),(4958,'Mukono','108',1223),(4959,'Nakapiripirit','311',1223),(4960,'Nakasongola','109',1223),(4961,'Nebbi','310',1223),(4962,'Ntungamo','411',1223),(4963,'Pader','312',1223),(4964,'Pallisa','210',1223),(4965,'Rakai','110',1223),(4966,'Rukungiri','412',1223),(4967,'Sembabule','111',1223),(4968,'Sironko','215',1223),(4969,'Soroti','211',1223),(4970,'Tororo','212',1223),(4971,'Wakiso','113',1223),(4972,'Yumbe','313',1223),(4973,'Baker Island','81',1227),(4974,'Howland Island','84',1227),(4975,'Jarvis Island','86',1227),(4976,'Johnston Atoll','67',1227),(4977,'Kingman Reef','89',1227),(4978,'Midway Islands','71',1227),(4979,'Navassa Island','76',1227),(4980,'Palmyra Atoll','95',1227),(4981,'Wake Island','79',1227),(4982,'Artigsa','AR',1229),(4983,'Canelones','CA',1229),(4984,'Cerro Largo','CL',1229),(4985,'Colonia','CO',1229),(4986,'Durazno','DU',1229),(4987,'Flores','FS',1229),(4988,'Lavalleja','LA',1229),(4989,'Maldonado','MA',1229),(4990,'Montevideo','MO',1229),(4991,'Paysandu','PA',1229),(4992,'Rivera','RV',1229),(4993,'Rocha','RO',1229),(4994,'Salto','SA',1229),(4995,'Soriano','SO',1229),(4996,'Tacuarembo','TA',1229),(4997,'Treinta y Tres','TT',1229),(4998,'Toshkent (city)','TK',1230),(4999,'Qoraqalpogiston Respublikasi','QR',1230),(5000,'Andijon','AN',1230),(5001,'Buxoro','BU',1230),(5002,'Farg\'ona','FA',1230),(5003,'Jizzax','JI',1230),(5004,'Khorazm','KH',1230),(5005,'Namangan','NG',1230),(5006,'Navoiy','NW',1230),(5007,'Qashqadaryo','QA',1230),(5008,'Samarqand','SA',1230),(5009,'Sirdaryo','SI',1230),(5010,'Surxondaryo','SU',1230),(5011,'Toshkent','TO',1230),(5012,'Xorazm','XO',1230),(5013,'Distrito Federal','A',1232),(5014,'Anzoategui','B',1232),(5015,'Apure','C',1232),(5016,'Aragua','D',1232),(5017,'Barinas','E',1232),(5018,'Carabobo','G',1232),(5019,'Cojedes','H',1232),(5020,'Falcon','I',1232),(5021,'Guarico','J',1232),(5022,'Lara','K',1232),(5023,'Merida','L',1232),(5024,'Miranda','M',1232),(5025,'Monagas','N',1232),(5026,'Nueva Esparta','O',1232),(5027,'Portuguesa','P',1232),(5028,'Tachira','S',1232),(5029,'Trujillo','T',1232),(5030,'Vargas','X',1232),(5031,'Yaracuy','U',1232),(5032,'Zulia','V',1232),(5033,'Delta Amacuro','Y',1232),(5034,'Dependencias Federales','W',1232),(5035,'An Giang','44',1233),(5036,'Ba Ria - Vung Tau','43',1233),(5037,'Bac Can','53',1233),(5038,'Bac Giang','54',1233),(5039,'Bac Lieu','55',1233),(5040,'Bac Ninh','56',1233),(5041,'Ben Tre','50',1233),(5042,'Binh Dinh','31',1233),(5043,'Binh Duong','57',1233),(5044,'Binh Phuoc','58',1233),(5045,'Binh Thuan','40',1233),(5046,'Ca Mau','59',1233),(5047,'Can Tho','48',1233),(5048,'Cao Bang','04',1233),(5049,'Da Nang, thanh pho','60',1233),(5050,'Dong Nai','39',1233),(5051,'Dong Thap','45',1233),(5052,'Gia Lai','30',1233),(5053,'Ha Giang','03',1233),(5054,'Ha Nam','63',1233),(5055,'Ha Noi, thu do','64',1233),(5056,'Ha Tay','15',1233),(5057,'Ha Tinh','23',1233),(5058,'Hai Duong','61',1233),(5059,'Hai Phong, thanh pho','62',1233),(5060,'Hoa Binh','14',1233),(5061,'Ho Chi Minh, thanh pho [Sai Gon]','65',1233),(5062,'Hung Yen','66',1233),(5063,'Khanh Hoa','34',1233),(5064,'Kien Giang','47',1233),(5065,'Kon Tum','28',1233),(5066,'Lai Chau','01',1233),(5067,'Lam Dong','35',1233),(5068,'Lang Son','09',1233),(5069,'Lao Cai','02',1233),(5070,'Long An','41',1233),(5071,'Nam Dinh','67',1233),(5072,'Nghe An','22',1233),(5073,'Ninh Binh','18',1233),(5074,'Ninh Thuan','36',1233),(5075,'Phu Tho','68',1233),(5076,'Phu Yen','32',1233),(5077,'Quang Binh','24',1233),(5078,'Quang Nam','27',1233),(5079,'Quang Ngai','29',1233),(5080,'Quang Ninh','13',1233),(5081,'Quang Tri','25',1233),(5082,'Soc Trang','52',1233),(5083,'Son La','05',1233),(5084,'Tay Ninh','37',1233),(5085,'Thai Binh','20',1233),(5086,'Thai Nguyen','69',1233),(5087,'Thanh Hoa','21',1233),(5088,'Thua Thien-Hue','26',1233),(5089,'Tien Giang','46',1233),(5090,'Tra Vinh','51',1233),(5091,'Tuyen Quang','07',1233),(5092,'Vinh Long','49',1233),(5093,'Vinh Phuc','70',1233),(5094,'Yen Bai','06',1233),(5095,'Malampa','MAP',1231),(5096,'Penama','PAM',1231),(5097,'Sanma','SAM',1231),(5098,'Shefa','SEE',1231),(5099,'Tafea','TAE',1231),(5100,'Torba','TOB',1231),(5101,'A\'ana','AA',1185),(5102,'Aiga-i-le-Tai','AL',1185),(5103,'Atua','AT',1185),(5104,'Fa\'aaaleleaga','FA',1185),(5105,'Gaga\'emauga','GE',1185),(5106,'Gagaifomauga','GI',1185),(5107,'Palauli','PA',1185),(5108,'Satupa\'itea','SA',1185),(5109,'Tuamasaga','TU',1185),(5110,'Va\'a-o-Fonoti','VF',1185),(5111,'Vaisigano','VS',1185),(5112,'Crna Gora','CG',1243),(5113,'Srbija','SR',1242),(5114,'Kosovo-Metohija','KM',1242),(5115,'Vojvodina','VO',1242),(5116,'Abyan','AB',1237),(5117,'Adan','AD',1237),(5118,'Ad Dali','DA',1237),(5119,'Al Bayda\'','BA',1237),(5120,'Al Hudaydah','MU',1237),(5121,'Al Mahrah','MR',1237),(5122,'Al Mahwit','MW',1237),(5123,'Amran','AM',1237),(5124,'Dhamar','DH',1237),(5125,'Hadramawt','HD',1237),(5126,'Hajjah','HJ',1237),(5127,'Ibb','IB',1237),(5128,'Lahij','LA',1237),(5129,'Ma\'rib','MA',1237),(5130,'Sa\'dah','SD',1237),(5131,'San\'a\'','SN',1237),(5132,'Shabwah','SH',1237),(5133,'Ta\'izz','TA',1237),(5134,'Eastern Cape','EC',1196),(5135,'Free State','FS',1196),(5136,'Gauteng','GT',1196),(5137,'Kwazulu-Natal','NL',1196),(5138,'Mpumalanga','MP',1196),(5139,'Northern Cape','NC',1196),(5140,'Limpopo','NP',1196),(5141,'Western Cape','WC',1196),(5142,'Copperbelt','08',1239),(5143,'Luapula','04',1239),(5144,'Lusaka','09',1239),(5145,'North-Western','06',1239),(5146,'Bulawayo','BU',1240),(5147,'Harare','HA',1240),(5148,'Manicaland','MA',1240),(5149,'Mashonaland Central','MC',1240),(5150,'Mashonaland East','ME',1240),(5151,'Mashonaland West','MW',1240),(5152,'Masvingo','MV',1240),(5153,'Matabeleland North','MN',1240),(5154,'Matabeleland South','MS',1240),(5155,'Midlands','MI',1240),(5156,'South Karelia','SK',1075),(5157,'South Ostrobothnia','SO',1075),(5158,'Etelä-Savo','ES',1075),(5159,'Häme','HH',1075),(5160,'Itä-Uusimaa','IU',1075),(5161,'Kainuu','KA',1075),(5162,'Central Ostrobothnia','CO',1075),(5163,'Central Finland','CF',1075),(5164,'Kymenlaakso','KY',1075),(5165,'Lapland','LA',1075),(5166,'Tampere Region','TR',1075),(5167,'Ostrobothnia','OB',1075),(5168,'North Karelia','NK',1075),(5169,'Northern Ostrobothnia','NO',1075),(5170,'Northern Savo','NS',1075),(5171,'Päijät-Häme','PH',1075),(5172,'Satakunta','SK',1075),(5173,'Uusimaa','UM',1075),(5174,'South-West Finland','SW',1075),(5175,'Ã…land','AL',1075),(5176,'Limburg','LI',1152),(5177,'Central and Western','CW',1098),(5178,'Eastern','EA',1098),(5179,'Southern','SO',1098),(5180,'Wan Chai','WC',1098),(5181,'Kowloon City','KC',1098),(5182,'Kwun Tong','KU',1098),(5183,'Sham Shui Po','SS',1098),(5184,'Wong Tai Sin','WT',1098),(5185,'Yau Tsim Mong','YT',1098),(5186,'Islands','IS',1098),(5187,'Kwai Tsing','KI',1098),(5188,'North','NO',1098),(5189,'Sai Kung','SK',1098),(5190,'Sha Tin','ST',1098),(5191,'Tai Po','TP',1098),(5192,'Tsuen Wan','TW',1098),(5193,'Tuen Mun','TM',1098),(5194,'Yuen Long','YL',1098),(5195,'Manchester','MR',1108),(5196,'Al ManÄmah (Al ‘Āşimah)','13',1016),(5197,'Al JanÅ«bÄ«yah','14',1016),(5199,'Al Wusţá','16',1016),(5200,'Ash ShamÄlÄ«yah','17',1016),(5201,'Jenin','_A',1165),(5202,'Tubas','_B',1165),(5203,'Tulkarm','_C',1165),(5204,'Nablus','_D',1165),(5205,'Qalqilya','_E',1165),(5206,'Salfit','_F',1165),(5207,'Ramallah and Al-Bireh','_G',1165),(5208,'Jericho','_H',1165),(5209,'Jerusalem','_I',1165),(5210,'Bethlehem','_J',1165),(5211,'Hebron','_K',1165),(5212,'North Gaza','_L',1165),(5213,'Gaza','_M',1165),(5214,'Deir el-Balah','_N',1165),(5215,'Khan Yunis','_O',1165),(5216,'Rafah','_P',1165),(5217,'Brussels','BRU',1020),(5218,'Distrito Federal','DIF',1140),(5219,'Taichung City','TXG',1208),(5220,'Kaohsiung City','KHH',1208),(5221,'Taipei City','TPE',1208),(5222,'Chiayi City','CYI',1208),(5223,'Hsinchu City','HSZ',1208),(5224,'Tainan City','TNN',1208),(9000,'North West','NW',1196),(9986,'Tyne and Wear','TWR',1226),(9988,'Greater Manchester','GTM',1226),(9989,'Co Tyrone','TYR',1226),(9990,'West Yorkshire','WYK',1226),(9991,'South Yorkshire','SYK',1226),(9992,'Merseyside','MSY',1226),(9993,'Berkshire','BRK',1226),(9994,'West Midlands','WMD',1226),(9998,'West Glamorgan','WGM',1226),(9999,'London','LON',1226),(10000,'Carbonia-Iglesias','CI',1107),(10001,'Olbia-Tempio','OT',1107),(10002,'Medio Campidano','VS',1107),(10003,'Ogliastra','OG',1107),(10009,'Jura','39',1076),(10010,'Barletta-Andria-Trani','Bar',1107),(10011,'Fermo','Fer',1107),(10012,'Monza e Brianza','Mon',1107),(10013,'Clwyd','CWD',1226),(10014,'Dyfed','DFD',1226),(10015,'South Glamorgan','SGM',1226),(10016,'Artibonite','AR',1094),(10017,'Centre','CE',1094),(10018,'Nippes','NI',1094),(10019,'Nord','ND',1094),(10020,'La Rioja','F',1010),(10021,'Andorra la Vella','07',1005),(10022,'Canillo','02',1005),(10023,'Encamp','03',1005),(10024,'Escaldes-Engordany','08',1005),(10025,'La Massana','04',1005),(10026,'Ordino','05',1005),(10027,'Sant Julia de Loria','06',1005),(10028,'Abaco Islands','AB',1212),(10029,'Andros Island','AN',1212),(10030,'Berry Islands','BR',1212),(10031,'Eleuthera','EL',1212),(10032,'Grand Bahama','GB',1212),(10033,'Rum Cay','RC',1212),(10034,'San Salvador Island','SS',1212),(10035,'Kongo central','01',1050),(10036,'Kwango','02',1050),(10037,'Kwilu','03',1050),(10038,'Mai-Ndombe','04',1050),(10039,'Kasai','05',1050),(10040,'Lulua','06',1050),(10041,'Lomami','07',1050),(10042,'Sankuru','08',1050),(10043,'Ituri','09',1050),(10044,'Haut-Uele','10',1050),(10045,'Tshopo','11',1050),(10046,'Bas-Uele','12',1050),(10047,'Nord-Ubangi','13',1050),(10048,'Mongala','14',1050),(10049,'Sud-Ubangi','15',1050),(10050,'Tshuapa','16',1050),(10051,'Haut-Lomami','17',1050),(10052,'Lualaba','18',1050),(10053,'Haut-Katanga','19',1050),(10054,'Tanganyika','20',1050),(10055,'Toledo','TO',1198),(10056,'Córdoba','CO',1198),(10057,'Metropolitan Manila','MNL',1170),(10058,'La Paz','LP',1097),(10059,'Yinchuan','YN',1045),(10060,'Shizuishan','SZ',1045),(10061,'Wuzhong','WZ',1045),(10062,'Guyuan','GY',1045),(10063,'Zhongwei','ZW',1045),(10064,'Luxembourg','L',1126),(10065,'Aizkraukles novads','002',1119),(10066,'Jaunjelgavas novads','038',1119),(10067,'Pļaviņu novads','072',1119),(10068,'Kokneses novads','046',1119),(10069,'Neretas novads','065',1119),(10070,'SkrÄ«veru novads','092',1119),(10071,'AlÅ«ksnes novads','007',1119),(10072,'Apes novads','009',1119),(10073,'Balvu novads','015',1119),(10074,'Viļakas novads','108',1119),(10075,'Baltinavas novads','014',1119),(10076,'RugÄju novads','082',1119),(10077,'Bauskas novads','016',1119),(10078,'Iecavas novads','034',1119),(10079,'RundÄles novads','083',1119),(10080,'Vecumnieku novads','105',1119),(10081,'CÄ“su novads','022',1119),(10082,'LÄ«gatnes novads','055',1119),(10083,'Amatas novads','008',1119),(10084,'Jaunpiebalgas novads','039',1119),(10085,'Priekuļu novads','075',1119),(10086,'PÄrgaujas novads','070',1119),(10087,'Raunas novads','076',1119),(10088,'Vecpiebalgas novads','104',1119),(10089,'Daugavpils novads','025',1119),(10090,'IlÅ«kstes novads','036',1119),(10091,'Dobeles novads','026',1119),(10092,'Auces novads','010',1119),(10093,'TÄ“rvetes novads','098',1119),(10094,'Gulbenes novads','033',1119),(10095,'Jelgavas novads','041',1119),(10096,'Ozolnieku novads','069',1119),(10097,'JÄ“kabpils novads','042',1119),(10098,'AknÄ«stes novads','004',1119),(10099,'ViesÄ«tes novads','107',1119),(10100,'Krustpils novads','049',1119),(10101,'Salas novads','085',1119),(10102,'KrÄslavas novads','047',1119),(10103,'Dagdas novads','024',1119),(10104,'Aglonas novads','001',1119),(10105,'KuldÄ«gas novads','050',1119),(10106,'Skrundas novads','093',1119),(10107,'Alsungas novads','006',1119),(10108,'Aizputes novads','003',1119),(10109,'Durbes novads','028',1119),(10110,'Grobiņas novads','032',1119),(10111,'PÄvilostas novads','071',1119),(10112,'Priekules novads','074',1119),(10113,'NÄ«cas novads','066',1119),(10114,'Rucavas novads','081',1119),(10115,'Vaiņodes novads','100',1119),(10116,'Limbažu novads','054',1119),(10117,'Alojas novads','005',1119),(10118,'SalacgrÄ«vas novads','086',1119),(10119,'Ludzas novads','058',1119),(10120,'KÄrsavas novads','044',1119),(10121,'Zilupes novads','110',1119),(10122,'Ciblas novads','023',1119),(10123,'Madonas novads','059',1119),(10124,'Cesvaines novads','021',1119),(10125,'LubÄnas novads','057',1119),(10126,'VarakļÄnu novads','102',1119),(10127,'Ä’rgļu novads','030',1119),(10128,'Ogres novads','067',1119),(10129,'IkÅ¡Ä·iles novads','035',1119),(10130,'Ķeguma novads','051',1119),(10131,'LielvÄrdes novads','053',1119),(10132,'Preiļu novads','073',1119),(10133,'LÄ«vÄnu novads','056',1119),(10134,'Riebiņu novads','078',1119),(10135,'VÄrkavas novads','103',1119),(10136,'RÄ“zeknes novads','077',1119),(10137,'ViļÄnu novads','109',1119),(10138,'Baldones novads','013',1119),(10139,'Ķekavas novads','052',1119),(10140,'Olaines novads','068',1119),(10141,'Salaspils novads','087',1119),(10142,'Saulkrastu novads','089',1119),(10143,'Siguldas novads','091',1119),(10144,'InÄukalna novads','037',1119),(10145,'Ä€dažu novads','011',1119),(10146,'BabÄ«tes novads','012',1119),(10147,'Carnikavas novads','020',1119),(10148,'Garkalnes novads','031',1119),(10149,'Krimuldas novads','048',1119),(10150,'MÄlpils novads','061',1119),(10151,'MÄrupes novads','062',1119),(10152,'Ropažu novads','080',1119),(10153,'SÄ“jas novads','090',1119),(10154,'Stopiņu novads','095',1119),(10155,'Saldus novads','088',1119),(10156,'BrocÄ“nu novads','018',1119),(10157,'Talsu novads','097',1119),(10158,'Dundagas novads','027',1119),(10159,'MÄ“rsraga novads','063',1119),(10160,'Rojas novads','079',1119),(10161,'Tukuma novads','099',1119),(10162,'Kandavas novads','043',1119),(10163,'Engures novads','029',1119),(10164,'Jaunpils novads','040',1119),(10165,'Valkas novads','101',1119),(10166,'Smiltenes novads','094',1119),(10167,'StrenÄu novads','096',1119),(10168,'KocÄ“nu novads','045',1119),(10169,'Mazsalacas novads','060',1119),(10170,'RÅ«jienas novads','084',1119),(10171,'BeverÄ«nas novads','017',1119),(10172,'Burtnieku novads','019',1119),(10173,'NaukÅ¡Ä“nu novads','064',1119),(10174,'Ventspils novads','106',1119),(10175,'JÄ“kabpils','JKB',1119),(10176,'Valmiera','VMR',1119),(10177,'Florida','FL',1229),(10178,'Rio Negro','RN',1229),(10179,'San Jose','SJ',1229),(10180,'Plateau','PL',1157),(10181,'Pieria','61',1085),(10182,'Los Rios','LR',1044),(10183,'Arica y Parinacota','AP',1044),(10184,'Amazonas','AMA',1169),(10185,'Kalimantan Tengah','KT',1102),(10186,'Sulawesi Barat','SR',1102),(10187,'Kalimantan Utara','KU',1102),(10188,'Ankaran','86',1193),(10189,'ApaÄe','87',1193),(10190,'Cirkulane','88',1193),(10191,'Gorje','89',1193),(10192,'Kostanjevica na Krki','90',1193),(10193,'Log-Dragomer','91',1193),(10194,'Makole','92',1193),(10195,'Mirna','93',1193),(10196,'Mokronog-Trebelno','94',1193),(10197,'Odranci','95',1193),(10198,'Oplotnica','96',1193),(10199,'Ormož','97',1193),(10200,'Osilnica','98',1193),(10201,'Pesnica','99',1193),(10202,'Piran','100',1193),(10203,'Pivka','101',1193),(10204,'PodÄetrtek','102',1193),(10205,'Podlehnik','103',1193),(10206,'Podvelka','104',1193),(10207,'PoljÄane','105',1193),(10208,'Polzela','106',1193),(10209,'Postojna','107',1193),(10210,'Prebold','108',1193),(10211,'Preddvor','109',1193),(10212,'Prevalje','110',1193),(10213,'Ptuj','111',1193),(10214,'Puconci','112',1193),(10215,'RaÄe-Fram','113',1193),(10216,'RadeÄe','114',1193),(10217,'Radenci','115',1193),(10218,'Radlje ob Dravi','139',1193),(10219,'Radovljica','145',1193),(10220,'Ravne na KoroÅ¡kem','171',1193),(10221,'Razkrižje','172',1193),(10222,'ReÄica ob Savinji','173',1193),(10223,'RenÄe-Vogrsko','174',1193),(10224,'Ribnica','175',1193),(10225,'Ribnica na Pohorju','176',1193),(10226,'RogaÅ¡ka Slatina','177',1193),(10227,'RogaÅ¡ovci','178',1193),(10228,'Rogatec','179',1193),(10229,'RuÅ¡e','180',1193),(10230,'Selnica ob Dravi','195',1193),(10231,'SemiÄ','196',1193),(10232,'Å entrupert','197',1193),(10233,'Sevnica','198',1193),(10234,'Sežana','199',1193),(10235,'Slovenj Gradec','200',1193),(10236,'Slovenska Bistrica','201',1193),(10237,'Slovenske Konjice','202',1193),(10238,'Å marjeÅ¡ke Toplice','203',1193),(10239,'Sodražica','204',1193),(10240,'SolÄava','205',1193),(10241,'SrediÅ¡Äe ob Dravi','206',1193),(10242,'StarÅ¡e','207',1193),(10243,'Straža','208',1193),(10244,'Sveta Trojica v Slovenskih goricah','209',1193),(10245,'Sveti Jurij v Slovenskih goricah','210',1193),(10246,'Sveti Tomaž','211',1193),(10247,'Vodice','212',1193),(10248,'Abkhazia','AB',1081),(10249,'Adjara','AJ',1081),(10250,'Tbilisi','TB',1081),(10251,'Guria','GU',1081),(10252,'Imereti','IM',1081),(10253,'Kakheti','KA',1081),(10254,'Kvemo Kartli','KK',1081),(10255,'Mtskheta-Mtianeti','MM',1081),(10256,'Racha-Lechkhumi and Kvemo Svaneti','RL',1081),(10257,'Samegrelo-Zemo Svaneti','SZ',1081),(10258,'Samtskhe-Javakheti','SJ',1081),(10259,'Shida Kartli','SK',1081),(10260,'Central','C',1074),(10261,'Punjab','PB',1163),(10262,'La Libertad','LI',1066),(10263,'La Paz','PA',1066),(10264,'La Union','UN',1066),(10265,'Littoral','LT',1038),(10266,'Nord-Ouest','NW',1038),(10267,'Telangana','TG',1101),(10268,'Ash Sharqiyah','04',1187),(10269,'Guadeloupe','GP',1076),(10270,'Martinique','MQ',1076),(10271,'Guyane','GF',1076),(10272,'La Réunion','RE',1076),(10273,'Mayotte','YT',1076);
+INSERT INTO `civicrm_state_province` (`id`, `name`, `abbreviation`, `country_id`) VALUES (1000,'Alabama','AL',1228),(1001,'Alaska','AK',1228),(1002,'Arizona','AZ',1228),(1003,'Arkansas','AR',1228),(1004,'California','CA',1228),(1005,'Colorado','CO',1228),(1006,'Connecticut','CT',1228),(1007,'Delaware','DE',1228),(1008,'Florida','FL',1228),(1009,'Georgia','GA',1228),(1010,'Hawaii','HI',1228),(1011,'Idaho','ID',1228),(1012,'Illinois','IL',1228),(1013,'Indiana','IN',1228),(1014,'Iowa','IA',1228),(1015,'Kansas','KS',1228),(1016,'Kentucky','KY',1228),(1017,'Louisiana','LA',1228),(1018,'Maine','ME',1228),(1019,'Maryland','MD',1228),(1020,'Massachusetts','MA',1228),(1021,'Michigan','MI',1228),(1022,'Minnesota','MN',1228),(1023,'Mississippi','MS',1228),(1024,'Missouri','MO',1228),(1025,'Montana','MT',1228),(1026,'Nebraska','NE',1228),(1027,'Nevada','NV',1228),(1028,'New Hampshire','NH',1228),(1029,'New Jersey','NJ',1228),(1030,'New Mexico','NM',1228),(1031,'New York','NY',1228),(1032,'North Carolina','NC',1228),(1033,'North Dakota','ND',1228),(1034,'Ohio','OH',1228),(1035,'Oklahoma','OK',1228),(1036,'Oregon','OR',1228),(1037,'Pennsylvania','PA',1228),(1038,'Rhode Island','RI',1228),(1039,'South Carolina','SC',1228),(1040,'South Dakota','SD',1228),(1041,'Tennessee','TN',1228),(1042,'Texas','TX',1228),(1043,'Utah','UT',1228),(1044,'Vermont','VT',1228),(1045,'Virginia','VA',1228),(1046,'Washington','WA',1228),(1047,'West Virginia','WV',1228),(1048,'Wisconsin','WI',1228),(1049,'Wyoming','WY',1228),(1050,'District of Columbia','DC',1228),(1052,'American Samoa','AS',1228),(1053,'Guam','GU',1228),(1055,'Northern Mariana Islands','MP',1228),(1056,'Puerto Rico','PR',1228),(1057,'Virgin Islands','VI',1228),(1058,'United States Minor Outlying Islands','UM',1228),(1059,'Armed Forces Europe','AE',1228),(1060,'Armed Forces Americas','AA',1228),(1061,'Armed Forces Pacific','AP',1228),(1100,'Alberta','AB',1039),(1101,'British Columbia','BC',1039),(1102,'Manitoba','MB',1039),(1103,'New Brunswick','NB',1039),(1104,'Newfoundland and Labrador','NL',1039),(1105,'Northwest Territories','NT',1039),(1106,'Nova Scotia','NS',1039),(1107,'Nunavut','NU',1039),(1108,'Ontario','ON',1039),(1109,'Prince Edward Island','PE',1039),(1110,'Quebec','QC',1039),(1111,'Saskatchewan','SK',1039),(1112,'Yukon Territory','YT',1039),(1200,'Maharashtra','MM',1101),(1201,'Karnataka','KA',1101),(1202,'Andhra Pradesh','AP',1101),(1203,'Arunachal Pradesh','AR',1101),(1204,'Assam','AS',1101),(1205,'Bihar','BR',1101),(1206,'Chhattisgarh','CH',1101),(1207,'Goa','GA',1101),(1208,'Gujarat','GJ',1101),(1209,'Haryana','HR',1101),(1210,'Himachal Pradesh','HP',1101),(1211,'Jammu and Kashmir','JK',1101),(1212,'Jharkhand','JH',1101),(1213,'Kerala','KL',1101),(1214,'Madhya Pradesh','MP',1101),(1215,'Manipur','MN',1101),(1216,'Meghalaya','ML',1101),(1217,'Mizoram','MZ',1101),(1218,'Nagaland','NL',1101),(1219,'Orissa','OR',1101),(1220,'Punjab','PB',1101),(1221,'Rajasthan','RJ',1101),(1222,'Sikkim','SK',1101),(1223,'Tamil Nadu','TN',1101),(1224,'Tripura','TR',1101),(1225,'Uttaranchal','UL',1101),(1226,'Uttar Pradesh','UP',1101),(1227,'West Bengal','WB',1101),(1228,'Andaman and Nicobar Islands','AN',1101),(1229,'Dadra and Nagar Haveli','DN',1101),(1230,'Daman and Diu','DD',1101),(1231,'Delhi','DL',1101),(1232,'Lakshadweep','LD',1101),(1233,'Pondicherry','PY',1101),(1300,'mazowieckie','MZ',1172),(1301,'pomorskie','PM',1172),(1302,'dolnoÅ›lÄ…skie','DS',1172),(1303,'kujawsko-pomorskie','KP',1172),(1304,'lubelskie','LU',1172),(1305,'lubuskie','LB',1172),(1306,'łódzkie','LD',1172),(1307,'maÅ‚opolskie','MA',1172),(1308,'opolskie','OP',1172),(1309,'podkarpackie','PK',1172),(1310,'podlaskie','PD',1172),(1311,'Å›lÄ…skie','SL',1172),(1312,'Å›wiÄ™tokrzyskie','SK',1172),(1313,'warmiÅ„sko-mazurskie','WN',1172),(1314,'wielkopolskie','WP',1172),(1315,'zachodniopomorskie','ZP',1172),(1500,'Abu Zaby','AZ',1225),(1501,'\'Ajman','AJ',1225),(1502,'Al Fujayrah','FU',1225),(1503,'Ash Shariqah','SH',1225),(1504,'Dubayy','DU',1225),(1505,'Ra\'s al Khaymah','RK',1225),(1506,'Dac Lac','33',1233),(1507,'Umm al Qaywayn','UQ',1225),(1508,'Badakhshan','BDS',1001),(1509,'Badghis','BDG',1001),(1510,'Baghlan','BGL',1001),(1511,'Balkh','BAL',1001),(1512,'Bamian','BAM',1001),(1513,'Farah','FRA',1001),(1514,'Faryab','FYB',1001),(1515,'Ghazni','GHA',1001),(1516,'Ghowr','GHO',1001),(1517,'Helmand','HEL',1001),(1518,'Herat','HER',1001),(1519,'Jowzjan','JOW',1001),(1520,'Kabul','KAB',1001),(1521,'Kandahar','KAN',1001),(1522,'Kapisa','KAP',1001),(1523,'Khowst','KHO',1001),(1524,'Konar','KNR',1001),(1525,'Kondoz','KDZ',1001),(1526,'Laghman','LAG',1001),(1527,'Lowgar','LOW',1001),(1528,'Nangrahar','NAN',1001),(1529,'Nimruz','NIM',1001),(1530,'Nurestan','NUR',1001),(1531,'Oruzgan','ORU',1001),(1532,'Paktia','PIA',1001),(1533,'Paktika','PKA',1001),(1534,'Parwan','PAR',1001),(1535,'Samangan','SAM',1001),(1536,'Sar-e Pol','SAR',1001),(1537,'Takhar','TAK',1001),(1538,'Wardak','WAR',1001),(1539,'Zabol','ZAB',1001),(1540,'Berat','BR',1002),(1541,'Bulqizë','BU',1002),(1542,'Delvinë','DL',1002),(1543,'Devoll','DV',1002),(1544,'Dibër','DI',1002),(1545,'Durrës','DR',1002),(1546,'Elbasan','EL',1002),(1547,'Fier','FR',1002),(1548,'Gramsh','GR',1002),(1549,'Gjirokastër','GJ',1002),(1550,'Has','HA',1002),(1551,'Kavajë','KA',1002),(1552,'Kolonjë','ER',1002),(1553,'Korçë','KO',1002),(1554,'Krujë','KR',1002),(1555,'Kuçovë','KC',1002),(1556,'Kukës','KU',1002),(1557,'Kurbin','KB',1002),(1558,'Lezhë','LE',1002),(1559,'Librazhd','LB',1002),(1560,'Lushnjë','LU',1002),(1561,'Malësi e Madhe','MM',1002),(1562,'Mallakastër','MK',1002),(1563,'Mat','MT',1002),(1564,'Mirditë','MR',1002),(1565,'Peqin','PQ',1002),(1566,'Përmet','PR',1002),(1567,'Pogradec','PG',1002),(1568,'Pukë','PU',1002),(1569,'Sarandë','SR',1002),(1570,'Skrapar','SK',1002),(1571,'Shkodër','SH',1002),(1572,'Tepelenë','TE',1002),(1573,'Tiranë','TR',1002),(1574,'Tropojë','TP',1002),(1575,'Vlorë','VL',1002),(1576,'Erevan','ER',1011),(1577,'Aragacotn','AG',1011),(1578,'Ararat','AR',1011),(1579,'Armavir','AV',1011),(1580,'Gegarkunik\'','GR',1011),(1581,'Kotayk\'','KT',1011),(1582,'Lory','LO',1011),(1583,'Sirak','SH',1011),(1584,'Syunik\'','SU',1011),(1585,'Tavus','TV',1011),(1586,'Vayoc Jor','VD',1011),(1587,'Bengo','BGO',1006),(1588,'Benguela','BGU',1006),(1589,'Bie','BIE',1006),(1590,'Cabinda','CAB',1006),(1591,'Cuando-Cubango','CCU',1006),(1592,'Cuanza Norte','CNO',1006),(1593,'Cuanza Sul','CUS',1006),(1594,'Cunene','CNN',1006),(1595,'Huambo','HUA',1006),(1596,'Huila','HUI',1006),(1597,'Luanda','LUA',1006),(1598,'Lunda Norte','LNO',1006),(1599,'Lunda Sul','LSU',1006),(1600,'Malange','MAL',1006),(1601,'Moxico','MOX',1006),(1602,'Namibe','NAM',1006),(1603,'Uige','UIG',1006),(1604,'Zaire','ZAI',1006),(1605,'Capital federal','C',1010),(1606,'Buenos Aires','B',1010),(1607,'Catamarca','K',1010),(1608,'Cordoba','X',1010),(1609,'Corrientes','W',1010),(1610,'Chaco','H',1010),(1611,'Chubut','U',1010),(1612,'Entre Rios','E',1010),(1613,'Formosa','P',1010),(1614,'Jujuy','Y',1010),(1615,'La Pampa','L',1010),(1616,'Mendoza','M',1010),(1617,'Misiones','N',1010),(1618,'Neuquen','Q',1010),(1619,'Rio Negro','R',1010),(1620,'Salta','A',1010),(1621,'San Juan','J',1010),(1622,'San Luis','D',1010),(1623,'Santa Cruz','Z',1010),(1624,'Santa Fe','S',1010),(1625,'Santiago del Estero','G',1010),(1626,'Tierra del Fuego','V',1010),(1627,'Tucuman','T',1010),(1628,'Burgenland','1',1014),(1629,'Kärnten','2',1014),(1630,'Niederosterreich','3',1014),(1631,'Oberosterreich','4',1014),(1632,'Salzburg','5',1014),(1633,'Steiermark','6',1014),(1634,'Tirol','7',1014),(1635,'Vorarlberg','8',1014),(1636,'Wien','9',1014),(1637,'Australian Antarctic Territory','AAT',1008),(1638,'Australian Capital Territory','ACT',1013),(1639,'Northern Territory','NT',1013),(1640,'New South Wales','NSW',1013),(1641,'Queensland','QLD',1013),(1642,'South Australia','SA',1013),(1643,'Tasmania','TAS',1013),(1644,'Victoria','VIC',1013),(1645,'Western Australia','WA',1013),(1646,'Naxcivan','NX',1015),(1647,'Ali Bayramli','AB',1015),(1648,'Baki','BA',1015),(1649,'Ganca','GA',1015),(1650,'Lankaran','LA',1015),(1651,'Mingacevir','MI',1015),(1652,'Naftalan','NA',1015),(1653,'Saki','SA',1015),(1654,'Sumqayit','SM',1015),(1655,'Susa','SS',1015),(1656,'Xankandi','XA',1015),(1657,'Yevlax','YE',1015),(1658,'Abseron','ABS',1015),(1659,'Agcabadi','AGC',1015),(1660,'Agdam','AGM',1015),(1661,'Agdas','AGS',1015),(1662,'Agstafa','AGA',1015),(1663,'Agsu','AGU',1015),(1664,'Astara','AST',1015),(1665,'Babak','BAB',1015),(1666,'Balakan','BAL',1015),(1667,'Barda','BAR',1015),(1668,'Beylagan','BEY',1015),(1669,'Bilasuvar','BIL',1015),(1670,'Cabrayll','CAB',1015),(1671,'Calilabad','CAL',1015),(1672,'Culfa','CUL',1015),(1673,'Daskasan','DAS',1015),(1674,'Davaci','DAV',1015),(1675,'Fuzuli','FUZ',1015),(1676,'Gadabay','GAD',1015),(1677,'Goranboy','GOR',1015),(1678,'Goycay','GOY',1015),(1679,'Haciqabul','HAC',1015),(1680,'Imisli','IMI',1015),(1681,'Ismayilli','ISM',1015),(1682,'Kalbacar','KAL',1015),(1683,'Kurdamir','KUR',1015),(1684,'Lacin','LAC',1015),(1685,'Lerik','LER',1015),(1686,'Masalli','MAS',1015),(1687,'Neftcala','NEF',1015),(1688,'Oguz','OGU',1015),(1689,'Ordubad','ORD',1015),(1690,'Qabala','QAB',1015),(1691,'Qax','QAX',1015),(1692,'Qazax','QAZ',1015),(1693,'Qobustan','QOB',1015),(1694,'Quba','QBA',1015),(1695,'Qubadli','QBI',1015),(1696,'Qusar','QUS',1015),(1697,'Saatli','SAT',1015),(1698,'Sabirabad','SAB',1015),(1699,'Sadarak','SAD',1015),(1700,'Sahbuz','SAH',1015),(1701,'Salyan','SAL',1015),(1702,'Samaxi','SMI',1015),(1703,'Samkir','SKR',1015),(1704,'Samux','SMX',1015),(1705,'Sarur','SAR',1015),(1706,'Siyazan','SIY',1015),(1707,'Tartar','TAR',1015),(1708,'Tovuz','TOV',1015),(1709,'Ucar','UCA',1015),(1710,'Xacmaz','XAC',1015),(1711,'Xanlar','XAN',1015),(1712,'Xizi','XIZ',1015),(1713,'Xocali','XCI',1015),(1714,'Xocavand','XVD',1015),(1715,'Yardimli','YAR',1015),(1716,'Zangilan','ZAN',1015),(1717,'Zaqatala','ZAQ',1015),(1718,'Zardab','ZAR',1015),(1719,'Federacija Bosna i Hercegovina','BIH',1026),(1720,'Republika Srpska','SRP',1026),(1721,'Bagerhat zila','05',1017),(1722,'Bandarban zila','01',1017),(1723,'Barguna zila','02',1017),(1724,'Barisal zila','06',1017),(1725,'Bhola zila','07',1017),(1726,'Bogra zila','03',1017),(1727,'Brahmanbaria zila','04',1017),(1728,'Chandpur zila','09',1017),(1729,'Chittagong zila','10',1017),(1730,'Chuadanga zila','12',1017),(1731,'Comilla zila','08',1017),(1732,'Cox\'s Bazar zila','11',1017),(1733,'Dhaka zila','13',1017),(1734,'Dinajpur zila','14',1017),(1735,'Faridpur zila','15',1017),(1736,'Feni zila','16',1017),(1737,'Gaibandha zila','19',1017),(1738,'Gazipur zila','18',1017),(1739,'Gopalganj zila','17',1017),(1740,'Habiganj zila','20',1017),(1741,'Jaipurhat zila','24',1017),(1742,'Jamalpur zila','21',1017),(1743,'Jessore zila','22',1017),(1744,'Jhalakati zila','25',1017),(1745,'Jhenaidah zila','23',1017),(1746,'Khagrachari zila','29',1017),(1747,'Khulna zila','27',1017),(1748,'Kishorganj zila','26',1017),(1749,'Kurigram zila','28',1017),(1750,'Kushtia zila','30',1017),(1751,'Lakshmipur zila','31',1017),(1752,'Lalmonirhat zila','32',1017),(1753,'Madaripur zila','36',1017),(1754,'Magura zila','37',1017),(1755,'Manikganj zila','33',1017),(1756,'Meherpur zila','39',1017),(1757,'Moulvibazar zila','38',1017),(1758,'Munshiganj zila','35',1017),(1759,'Mymensingh zila','34',1017),(1760,'Naogaon zila','48',1017),(1761,'Narail zila','43',1017),(1762,'Narayanganj zila','40',1017),(1763,'Narsingdi zila','42',1017),(1764,'Natore zila','44',1017),(1765,'Nawabganj zila','45',1017),(1766,'Netrakona zila','41',1017),(1767,'Nilphamari zila','46',1017),(1768,'Noakhali zila','47',1017),(1769,'Pabna zila','49',1017),(1770,'Panchagarh zila','52',1017),(1771,'Patuakhali zila','51',1017),(1772,'Pirojpur zila','50',1017),(1773,'Rajbari zila','53',1017),(1774,'Rajshahi zila','54',1017),(1775,'Rangamati zila','56',1017),(1776,'Rangpur zila','55',1017),(1777,'Satkhira zila','58',1017),(1778,'Shariatpur zila','62',1017),(1779,'Sherpur zila','57',1017),(1780,'Sirajganj zila','59',1017),(1781,'Sunamganj zila','61',1017),(1782,'Sylhet zila','60',1017),(1783,'Tangail zila','63',1017),(1784,'Thakurgaon zila','64',1017),(1785,'Antwerpen','VAN',1020),(1786,'Brabant Wallon','WBR',1020),(1787,'Hainaut','WHT',1020),(1788,'Liege','WLG',1020),(1789,'Limburg','VLI',1020),(1790,'Luxembourg','WLX',1020),(1791,'Namur','WNA',1020),(1792,'Oost-Vlaanderen','VOV',1020),(1793,'Vlaams-Brabant','VBR',1020),(1794,'West-Vlaanderen','VWV',1020),(1795,'Bale','BAL',1034),(1796,'Bam','BAM',1034),(1797,'Banwa','BAN',1034),(1798,'Bazega','BAZ',1034),(1799,'Bougouriba','BGR',1034),(1800,'Boulgou','BLG',1034),(1801,'Boulkiemde','BLK',1034),(1802,'Comoe','COM',1034),(1803,'Ganzourgou','GAN',1034),(1804,'Gnagna','GNA',1034),(1805,'Gourma','GOU',1034),(1806,'Houet','HOU',1034),(1807,'Ioba','IOB',1034),(1808,'Kadiogo','KAD',1034),(1809,'Kenedougou','KEN',1034),(1810,'Komondjari','KMD',1034),(1811,'Kompienga','KMP',1034),(1812,'Kossi','KOS',1034),(1813,'Koulpulogo','KOP',1034),(1814,'Kouritenga','KOT',1034),(1815,'Kourweogo','KOW',1034),(1816,'Leraba','LER',1034),(1817,'Loroum','LOR',1034),(1818,'Mouhoun','MOU',1034),(1819,'Nahouri','NAO',1034),(1820,'Namentenga','NAM',1034),(1821,'Nayala','NAY',1034),(1822,'Noumbiel','NOU',1034),(1823,'Oubritenga','OUB',1034),(1824,'Oudalan','OUD',1034),(1825,'Passore','PAS',1034),(1826,'Poni','PON',1034),(1827,'Sanguie','SNG',1034),(1828,'Sanmatenga','SMT',1034),(1829,'Seno','SEN',1034),(1830,'Siasili','SIS',1034),(1831,'Soum','SOM',1034),(1832,'Sourou','SOR',1034),(1833,'Tapoa','TAP',1034),(1834,'Tui','TUI',1034),(1835,'Yagha','YAG',1034),(1836,'Yatenga','YAT',1034),(1837,'Ziro','ZIR',1034),(1838,'Zondoma','ZON',1034),(1839,'Zoundweogo','ZOU',1034),(1840,'Blagoevgrad','01',1033),(1841,'Burgas','02',1033),(1842,'Dobrich','08',1033),(1843,'Gabrovo','07',1033),(1844,'Haskovo','26',1033),(1845,'Yambol','28',1033),(1846,'Kardzhali','09',1033),(1847,'Kyustendil','10',1033),(1848,'Lovech','11',1033),(1849,'Montana','12',1033),(1850,'Pazardzik','13',1033),(1851,'Pernik','14',1033),(1852,'Pleven','15',1033),(1853,'Plovdiv','16',1033),(1854,'Razgrad','17',1033),(1855,'Ruse','18',1033),(1856,'Silistra','19',1033),(1857,'Sliven','20',1033),(1858,'Smolyan','21',1033),(1859,'Sofia','23',1033),(1860,'Stara Zagora','24',1033),(1861,'Shumen','27',1033),(1862,'Targovishte','25',1033),(1863,'Varna','03',1033),(1864,'Veliko Tarnovo','04',1033),(1865,'Vidin','05',1033),(1866,'Vratsa','06',1033),(1867,'Al Hadd','01',1016),(1868,'Al Manamah','03',1016),(1869,'Al Mintaqah al Gharbiyah','10',1016),(1870,'Al Mintagah al Wusta','07',1016),(1871,'Al Mintaqah ash Shamaliyah','05',1016),(1872,'Al Muharraq','02',1016),(1873,'Ar Rifa','09',1016),(1874,'Jidd Hafs','04',1016),(1875,'Madluat Jamad','12',1016),(1876,'Madluat Isa','08',1016),(1877,'Mintaqat Juzur tawar','11',1016),(1878,'Sitrah','06',1016),(1879,'Bubanza','BB',1036),(1880,'Bujumbura','BJ',1036),(1881,'Bururi','BR',1036),(1882,'Cankuzo','CA',1036),(1883,'Cibitoke','CI',1036),(1884,'Gitega','GI',1036),(1885,'Karuzi','KR',1036),(1886,'Kayanza','KY',1036),(1887,'Makamba','MA',1036),(1888,'Muramvya','MU',1036),(1889,'Mwaro','MW',1036),(1890,'Ngozi','NG',1036),(1891,'Rutana','RT',1036),(1892,'Ruyigi','RY',1036),(1893,'Alibori','AL',1022),(1894,'Atakora','AK',1022),(1895,'Atlantique','AQ',1022),(1896,'Borgou','BO',1022),(1897,'Collines','CO',1022),(1898,'Donga','DO',1022),(1899,'Kouffo','KO',1022),(1900,'Littoral','LI',1022),(1901,'Mono','MO',1022),(1902,'Oueme','OU',1022),(1903,'Plateau','PL',1022),(1904,'Zou','ZO',1022),(1905,'Belait','BE',1032),(1906,'Brunei-Muara','BM',1032),(1907,'Temburong','TE',1032),(1908,'Tutong','TU',1032),(1909,'Cochabamba','C',1025),(1910,'Chuquisaca','H',1025),(1911,'El Beni','B',1025),(1912,'La Paz','L',1025),(1913,'Oruro','O',1025),(1914,'Pando','N',1025),(1915,'Potosi','P',1025),(1916,'Tarija','T',1025),(1917,'Acre','AC',1029),(1918,'Alagoas','AL',1029),(1919,'Amazonas','AM',1029),(1920,'Amapa','AP',1029),(1921,'Bahia','BA',1029),(1922,'Ceara','CE',1029),(1923,'Distrito Federal','DF',1029),(1924,'Espirito Santo','ES',1029),(1926,'Goias','GO',1029),(1927,'Maranhao','MA',1029),(1928,'Minas Gerais','MG',1029),(1929,'Mato Grosso do Sul','MS',1029),(1930,'Mato Grosso','MT',1029),(1931,'Para','PA',1029),(1932,'Paraiba','PB',1029),(1933,'Pernambuco','PE',1029),(1934,'Piaui','PI',1029),(1935,'Parana','PR',1029),(1936,'Rio de Janeiro','RJ',1029),(1937,'Rio Grande do Norte','RN',1029),(1938,'Rondonia','RO',1029),(1939,'Roraima','RR',1029),(1940,'Rio Grande do Sul','RS',1029),(1941,'Santa Catarina','SC',1029),(1942,'Sergipe','SE',1029),(1943,'Sao Paulo','SP',1029),(1944,'Tocantins','TO',1029),(1945,'Acklins and Crooked Islands','AC',1212),(1946,'Bimini','BI',1212),(1947,'Cat Island','CI',1212),(1948,'Exuma','EX',1212),(1955,'Inagua','IN',1212),(1957,'Long Island','LI',1212),(1959,'Mayaguana','MG',1212),(1960,'New Providence','NP',1212),(1962,'Ragged Island','RI',1212),(1966,'Bumthang','33',1024),(1967,'Chhukha','12',1024),(1968,'Dagana','22',1024),(1969,'Gasa','GA',1024),(1970,'Ha','13',1024),(1971,'Lhuentse','44',1024),(1972,'Monggar','42',1024),(1973,'Paro','11',1024),(1974,'Pemagatshel','43',1024),(1975,'Punakha','23',1024),(1976,'Samdrup Jongkha','45',1024),(1977,'Samtee','14',1024),(1978,'Sarpang','31',1024),(1979,'Thimphu','15',1024),(1980,'Trashigang','41',1024),(1981,'Trashi Yangtse','TY',1024),(1982,'Trongsa','32',1024),(1983,'Tsirang','21',1024),(1984,'Wangdue Phodrang','24',1024),(1985,'Zhemgang','34',1024),(1986,'Central','CE',1027),(1987,'Ghanzi','GH',1027),(1988,'Kgalagadi','KG',1027),(1989,'Kgatleng','KL',1027),(1990,'Kweneng','KW',1027),(1991,'Ngamiland','NG',1027),(1992,'North-East','NE',1027),(1993,'North-West','NW',1027),(1994,'South-East','SE',1027),(1995,'Southern','SO',1027),(1996,'Brèsckaja voblasc\'','BR',1019),(1997,'Homel\'skaja voblasc\'','HO',1019),(1998,'Hrodzenskaja voblasc\'','HR',1019),(1999,'Mahilëuskaja voblasc\'','MA',1019),(2000,'Minskaja voblasc\'','MI',1019),(2001,'Vicebskaja voblasc\'','VI',1019),(2002,'Belize','BZ',1021),(2003,'Cayo','CY',1021),(2004,'Corozal','CZL',1021),(2005,'Orange Walk','OW',1021),(2006,'Stann Creek','SC',1021),(2007,'Toledo','TOL',1021),(2008,'Kinshasa','KN',1050),(2011,'Equateur','EQ',1050),(2014,'Kasai-Oriental','KE',1050),(2016,'Maniema','MA',1050),(2017,'Nord-Kivu','NK',1050),(2019,'Sud-Kivu','SK',1050),(2020,'Bangui','BGF',1042),(2021,'Bamingui-Bangoran','BB',1042),(2022,'Basse-Kotto','BK',1042),(2023,'Haute-Kotto','HK',1042),(2024,'Haut-Mbomou','HM',1042),(2025,'Kemo','KG',1042),(2026,'Lobaye','LB',1042),(2027,'Mambere-Kadei','HS',1042),(2028,'Mbomou','MB',1042),(2029,'Nana-Grebizi','KB',1042),(2030,'Nana-Mambere','NM',1042),(2031,'Ombella-Mpoko','MP',1042),(2032,'Ouaka','UK',1042),(2033,'Ouham','AC',1042),(2034,'Ouham-Pende','OP',1042),(2035,'Sangha-Mbaere','SE',1042),(2036,'Vakaga','VR',1042),(2037,'Brazzaville','BZV',1051),(2038,'Bouenza','11',1051),(2039,'Cuvette','8',1051),(2040,'Cuvette-Ouest','15',1051),(2041,'Kouilou','5',1051),(2042,'Lekoumou','2',1051),(2043,'Likouala','7',1051),(2044,'Niari','9',1051),(2045,'Plateaux','14',1051),(2046,'Pool','12',1051),(2047,'Sangha','13',1051),(2048,'Aargau','AG',1205),(2049,'Appenzell Innerrhoden','AI',1205),(2050,'Appenzell Ausserrhoden','AR',1205),(2051,'Bern','BE',1205),(2052,'Basel-Landschaft','BL',1205),(2053,'Basel-Stadt','BS',1205),(2054,'Fribourg','FR',1205),(2055,'Geneva','GE',1205),(2056,'Glarus','GL',1205),(2057,'Graubunden','GR',1205),(2058,'Jura','JU',1205),(2059,'Luzern','LU',1205),(2060,'Neuchatel','NE',1205),(2061,'Nidwalden','NW',1205),(2062,'Obwalden','OW',1205),(2063,'Sankt Gallen','SG',1205),(2064,'Schaffhausen','SH',1205),(2065,'Solothurn','SO',1205),(2066,'Schwyz','SZ',1205),(2067,'Thurgau','TG',1205),(2068,'Ticino','TI',1205),(2069,'Uri','UR',1205),(2070,'Vaud','VD',1205),(2071,'Valais','VS',1205),(2072,'Zug','ZG',1205),(2073,'Zurich','ZH',1205),(2074,'18 Montagnes','06',1054),(2075,'Agnebi','16',1054),(2076,'Bas-Sassandra','09',1054),(2077,'Denguele','10',1054),(2078,'Haut-Sassandra','02',1054),(2079,'Lacs','07',1054),(2080,'Lagunes','01',1054),(2081,'Marahoue','12',1054),(2082,'Moyen-Comoe','05',1054),(2083,'Nzi-Comoe','11',1054),(2084,'Savanes','03',1054),(2085,'Sud-Bandama','15',1054),(2086,'Sud-Comoe','13',1054),(2087,'Vallee du Bandama','04',1054),(2088,'Worodouqou','14',1054),(2089,'Zanzan','08',1054),(2090,'Aisen del General Carlos Ibanez del Campo','AI',1044),(2091,'Antofagasta','AN',1044),(2092,'Araucania','AR',1044),(2093,'Atacama','AT',1044),(2094,'Bio-Bio','BI',1044),(2095,'Coquimbo','CO',1044),(2096,'Libertador General Bernardo O\'Higgins','LI',1044),(2097,'Los Lagos','LL',1044),(2098,'Magallanes','MA',1044),(2099,'Maule','ML',1044),(2100,'Santiago Metropolitan','SM',1044),(2101,'Tarapaca','TA',1044),(2102,'Valparaiso','VS',1044),(2103,'Adamaoua','AD',1038),(2104,'Centre','CE',1038),(2105,'East','ES',1038),(2106,'Far North','EN',1038),(2107,'North','NO',1038),(2108,'South','SW',1038),(2109,'South-West','SW',1038),(2110,'West','OU',1038),(2111,'Beijing','11',1045),(2112,'Chongqing','50',1045),(2113,'Shanghai','31',1045),(2114,'Tianjin','12',1045),(2115,'Anhui','34',1045),(2116,'Fujian','35',1045),(2117,'Gansu','62',1045),(2118,'Guangdong','44',1045),(2119,'Guizhou','52',1045),(2120,'Hainan','46',1045),(2121,'Hebei','13',1045),(2122,'Heilongjiang','23',1045),(2123,'Henan','41',1045),(2124,'Hubei','42',1045),(2125,'Hunan','43',1045),(2126,'Jiangsu','32',1045),(2127,'Jiangxi','36',1045),(2128,'Jilin','22',1045),(2129,'Liaoning','21',1045),(2130,'Qinghai','63',1045),(2131,'Shaanxi','61',1045),(2132,'Shandong','37',1045),(2133,'Shanxi','14',1045),(2134,'Sichuan','51',1045),(2135,'Taiwan','71',1045),(2136,'Yunnan','53',1045),(2137,'Zhejiang','33',1045),(2138,'Guangxi','45',1045),(2139,'Neia Mongol (mn)','15',1045),(2140,'Xinjiang','65',1045),(2141,'Xizang','54',1045),(2142,'Hong Kong','91',1045),(2143,'Macau','92',1045),(2144,'Distrito Capital de Bogotá','DC',1048),(2145,'Amazonea','AMA',1048),(2146,'Antioquia','ANT',1048),(2147,'Arauca','ARA',1048),(2148,'Atlántico','ATL',1048),(2149,'BolÃvar','BOL',1048),(2150,'Boyacá','BOY',1048),(2151,'Caldea','CAL',1048),(2152,'Caquetá','CAQ',1048),(2153,'Casanare','CAS',1048),(2154,'Cauca','CAU',1048),(2155,'Cesar','CES',1048),(2156,'Córdoba','COR',1048),(2157,'Cundinamarca','CUN',1048),(2158,'Chocó','CHO',1048),(2159,'GuainÃa','GUA',1048),(2160,'Guaviare','GUV',1048),(2161,'La Guajira','LAG',1048),(2162,'Magdalena','MAG',1048),(2163,'Meta','MET',1048),(2164,'Nariño','NAR',1048),(2165,'Norte de Santander','NSA',1048),(2166,'Putumayo','PUT',1048),(2167,'Quindio','QUI',1048),(2168,'Risaralda','RIS',1048),(2169,'San Andrés, Providencia y Santa Catalina','SAP',1048),(2170,'Santander','SAN',1048),(2171,'Sucre','SUC',1048),(2172,'Tolima','TOL',1048),(2173,'Valle del Cauca','VAC',1048),(2174,'Vaupés','VAU',1048),(2175,'Vichada','VID',1048),(2176,'Alajuela','A',1053),(2177,'Cartago','C',1053),(2178,'Guanacaste','G',1053),(2179,'Heredia','H',1053),(2180,'Limon','L',1053),(2181,'Puntarenas','P',1053),(2182,'San Jose','SJ',1053),(2183,'Camagey','09',1056),(2184,'Ciego de `vila','08',1056),(2185,'Cienfuegos','06',1056),(2186,'Ciudad de La Habana','03',1056),(2187,'Granma','12',1056),(2188,'Guantanamo','14',1056),(2189,'Holquin','11',1056),(2190,'La Habana','02',1056),(2191,'Las Tunas','10',1056),(2192,'Matanzas','04',1056),(2193,'Pinar del Rio','01',1056),(2194,'Sancti Spiritus','07',1056),(2195,'Santiago de Cuba','13',1056),(2196,'Villa Clara','05',1056),(2197,'Isla de la Juventud','99',1056),(2198,'Pinar del Roo','PR',1056),(2199,'Ciego de Avila','CA',1056),(2200,'Camagoey','CG',1056),(2201,'Holgun','HO',1056),(2202,'Sancti Spritus','SS',1056),(2203,'Municipio Especial Isla de la Juventud','IJ',1056),(2204,'Boa Vista','BV',1040),(2205,'Brava','BR',1040),(2206,'Calheta de Sao Miguel','CS',1040),(2207,'Fogo','FO',1040),(2208,'Maio','MA',1040),(2209,'Mosteiros','MO',1040),(2210,'Paul','PA',1040),(2211,'Porto Novo','PN',1040),(2212,'Praia','PR',1040),(2213,'Ribeira Grande','RG',1040),(2214,'Sal','SL',1040),(2215,'Sao Domingos','SD',1040),(2216,'Sao Filipe','SF',1040),(2217,'Sao Nicolau','SN',1040),(2218,'Sao Vicente','SV',1040),(2219,'Tarrafal','TA',1040),(2220,'Ammochostos Magusa','04',1057),(2221,'Keryneia','06',1057),(2222,'Larnaka','03',1057),(2223,'Lefkosia','01',1057),(2224,'Lemesos','02',1057),(2225,'Pafos','05',1057),(2226,'JihoÄeský kraj','JC',1058),(2227,'Jihomoravský kraj','JM',1058),(2228,'Karlovarský kraj','KA',1058),(2229,'Královéhradecký kraj','KR',1058),(2230,'Liberecký kraj','LI',1058),(2231,'Moravskoslezský kraj','MO',1058),(2232,'Olomoucký kraj','OL',1058),(2233,'Pardubický kraj','PA',1058),(2234,'Plzeňský kraj','PL',1058),(2235,'Praha, hlavnà mÄ›sto','PR',1058),(2236,'StÅ™edoÄeský kraj','ST',1058),(2237,'Ústecký kraj','US',1058),(2238,'VysoÄina','VY',1058),(2239,'ZlÃnský kraj','ZL',1058),(2240,'Baden-Wuerttemberg','BW',1082),(2241,'Bayern','BY',1082),(2242,'Bremen','HB',1082),(2243,'Hamburg','HH',1082),(2244,'Hessen','HE',1082),(2245,'Niedersachsen','NI',1082),(2246,'Nordrhein-Westfalen','NW',1082),(2247,'Rheinland-Pfalz','RP',1082),(2248,'Saarland','SL',1082),(2249,'Schleswig-Holstein','SH',1082),(2250,'Berlin','BR',1082),(2251,'Brandenburg','BB',1082),(2252,'Mecklenburg-Vorpommern','MV',1082),(2253,'Sachsen','SN',1082),(2254,'Sachsen-Anhalt','ST',1082),(2255,'Thueringen','TH',1082),(2256,'Ali Sabiah','AS',1060),(2257,'Dikhil','DI',1060),(2258,'Djibouti','DJ',1060),(2259,'Obock','OB',1060),(2260,'Tadjoura','TA',1060),(2261,'Frederiksberg','147',1059),(2262,'Copenhagen City','101',1059),(2263,'Copenhagen','015',1059),(2264,'Frederiksborg','020',1059),(2265,'Roskilde','025',1059),(2266,'Vestsjælland','030',1059),(2267,'Storstrøm','035',1059),(2268,'Bornholm','040',1059),(2269,'Fyn','042',1059),(2270,'South Jutland','050',1059),(2271,'Ribe','055',1059),(2272,'Vejle','060',1059),(2273,'Ringkjøbing','065',1059),(2274,'Ã…rhus','070',1059),(2275,'Viborg','076',1059),(2276,'North Jutland','080',1059),(2277,'Distrito Nacional (Santo Domingo)','01',1062),(2278,'Azua','02',1062),(2279,'Bahoruco','03',1062),(2280,'Barahona','04',1062),(2281,'Dajabón','05',1062),(2282,'Duarte','06',1062),(2283,'El Seybo [El Seibo]','08',1062),(2284,'Espaillat','09',1062),(2285,'Hato Mayor','30',1062),(2286,'Independencia','10',1062),(2287,'La Altagracia','11',1062),(2288,'La Estrelleta [Elias Pina]','07',1062),(2289,'La Romana','12',1062),(2290,'La Vega','13',1062),(2291,'Maroia Trinidad Sánchez','14',1062),(2292,'Monseñor Nouel','28',1062),(2293,'Monte Cristi','15',1062),(2294,'Monte Plata','29',1062),(2295,'Pedernales','16',1062),(2296,'Peravia','17',1062),(2297,'Puerto Plata','18',1062),(2298,'Salcedo','19',1062),(2299,'Samaná','20',1062),(2300,'San Cristóbal','21',1062),(2301,'San Pedro de MacorÃs','23',1062),(2302,'Sánchez RamÃrez','24',1062),(2303,'Santiago','25',1062),(2304,'Santiago RodrÃguez','26',1062),(2305,'Valverde','27',1062),(2306,'Adrar','01',1003),(2307,'Ain Defla','44',1003),(2308,'Ain Tmouchent','46',1003),(2309,'Alger','16',1003),(2310,'Annaba','23',1003),(2311,'Batna','05',1003),(2312,'Bechar','08',1003),(2313,'Bejaia','06',1003),(2314,'Biskra','07',1003),(2315,'Blida','09',1003),(2316,'Bordj Bou Arreridj','34',1003),(2317,'Bouira','10',1003),(2318,'Boumerdes','35',1003),(2319,'Chlef','02',1003),(2320,'Constantine','25',1003),(2321,'Djelfa','17',1003),(2322,'El Bayadh','32',1003),(2323,'El Oued','39',1003),(2324,'El Tarf','36',1003),(2325,'Ghardaia','47',1003),(2326,'Guelma','24',1003),(2327,'Illizi','33',1003),(2328,'Jijel','18',1003),(2329,'Khenchela','40',1003),(2330,'Laghouat','03',1003),(2331,'Mascara','29',1003),(2332,'Medea','26',1003),(2333,'Mila','43',1003),(2334,'Mostaganem','27',1003),(2335,'Msila','28',1003),(2336,'Naama','45',1003),(2337,'Oran','31',1003),(2338,'Ouargla','30',1003),(2339,'Oum el Bouaghi','04',1003),(2340,'Relizane','48',1003),(2341,'Saida','20',1003),(2342,'Setif','19',1003),(2343,'Sidi Bel Abbes','22',1003),(2344,'Skikda','21',1003),(2345,'Souk Ahras','41',1003),(2346,'Tamanghasset','11',1003),(2347,'Tebessa','12',1003),(2348,'Tiaret','14',1003),(2349,'Tindouf','37',1003),(2350,'Tipaza','42',1003),(2351,'Tissemsilt','38',1003),(2352,'Tizi Ouzou','15',1003),(2353,'Tlemcen','13',1003),(2354,'Azuay','A',1064),(2355,'Bolivar','B',1064),(2356,'Canar','F',1064),(2357,'Carchi','C',1064),(2358,'Cotopaxi','X',1064),(2359,'Chimborazo','H',1064),(2360,'El Oro','O',1064),(2361,'Esmeraldas','E',1064),(2362,'Galapagos','W',1064),(2363,'Guayas','G',1064),(2364,'Imbabura','I',1064),(2365,'Loja','L',1064),(2366,'Los Rios','R',1064),(2367,'Manabi','M',1064),(2368,'Morona-Santiago','S',1064),(2369,'Napo','N',1064),(2370,'Orellana','D',1064),(2371,'Pastaza','Y',1064),(2372,'Pichincha','P',1064),(2373,'Sucumbios','U',1064),(2374,'Tungurahua','T',1064),(2375,'Zamora-Chinchipe','Z',1064),(2376,'Harjumaa','37',1069),(2377,'Hiiumaa','39',1069),(2378,'Ida-Virumaa','44',1069),(2379,'Jõgevamaa','49',1069),(2380,'Järvamaa','51',1069),(2381,'Läänemaa','57',1069),(2382,'Lääne-Virumaa','59',1069),(2383,'Põlvamaa','65',1069),(2384,'Pärnumaa','67',1069),(2385,'Raplamaa','70',1069),(2386,'Saaremaa','74',1069),(2387,'Tartumaa','7B',1069),(2388,'Valgamaa','82',1069),(2389,'Viljandimaa','84',1069),(2390,'Võrumaa','86',1069),(2391,'Ad Daqahllyah','DK',1065),(2392,'Al Bahr al Ahmar','BA',1065),(2393,'Al Buhayrah','BH',1065),(2394,'Al Fayym','FYM',1065),(2395,'Al Gharbiyah','GH',1065),(2396,'Al Iskandarlyah','ALX',1065),(2397,'Al Isma illyah','IS',1065),(2398,'Al Jizah','GZ',1065),(2399,'Al Minuflyah','MNF',1065),(2400,'Al Minya','MN',1065),(2401,'Al Qahirah','C',1065),(2402,'Al Qalyublyah','KB',1065),(2403,'Al Wadi al Jadid','WAD',1065),(2404,'Ash Sharqiyah','SHR',1065),(2405,'As Suways','SUZ',1065),(2406,'Aswan','ASN',1065),(2407,'Asyut','AST',1065),(2408,'Bani Suwayf','BNS',1065),(2409,'Bur Sa\'id','PTS',1065),(2410,'Dumyat','DT',1065),(2411,'Janub Sina\'','JS',1065),(2412,'Kafr ash Shaykh','KFS',1065),(2413,'Matruh','MT',1065),(2414,'Qina','KN',1065),(2415,'Shamal Sina\'','SIN',1065),(2416,'Suhaj','SHG',1065),(2417,'Anseba','AN',1068),(2418,'Debub','DU',1068),(2419,'Debubawi Keyih Bahri [Debub-Keih-Bahri]','DK',1068),(2420,'Gash-Barka','GB',1068),(2421,'Maakel [Maekel]','MA',1068),(2422,'Semenawi Keyih Bahri [Semien-Keih-Bahri]','SK',1068),(2423,'Ãlava','VI',1198),(2424,'Albacete','AB',1198),(2425,'Alicante','A',1198),(2426,'AlmerÃa','AL',1198),(2427,'Asturias','O',1198),(2428,'Ãvila','AV',1198),(2429,'Badajoz','BA',1198),(2430,'Baleares','PM',1198),(2431,'Barcelona','B',1198),(2432,'Burgos','BU',1198),(2433,'Cáceres','CC',1198),(2434,'Cádiz','CA',1198),(2435,'Cantabria','S',1198),(2436,'Castellón','CS',1198),(2437,'Ciudad Real','CR',1198),(2438,'Cuenca','CU',1198),(2439,'Girona [Gerona]','GE',1198),(2440,'Granada','GR',1198),(2441,'Guadalajara','GU',1198),(2442,'Guipúzcoa','SS',1198),(2443,'Huelva','H',1198),(2444,'Huesca','HU',1198),(2445,'Jaén','J',1198),(2446,'La Coruña','C',1198),(2447,'La Rioja','LO',1198),(2448,'Las Palmas','GC',1198),(2449,'León','LE',1198),(2450,'Lleida [Lérida]','L',1198),(2451,'Lugo','LU',1198),(2452,'Madrid','M',1198),(2453,'Málaga','MA',1198),(2454,'Murcia','MU',1198),(2455,'Navarra','NA',1198),(2456,'Ourense','OR',1198),(2457,'Palencia','P',1198),(2458,'Pontevedra','PO',1198),(2459,'Salamanca','SA',1198),(2460,'Santa Cruz de Tenerife','TF',1198),(2461,'Segovia','SG',1198),(2462,'Sevilla','SE',1198),(2463,'Soria','SO',1198),(2464,'Tarragona','T',1198),(2465,'Teruel','TE',1198),(2466,'Valencia','V',1198),(2467,'Valladolid','VA',1198),(2468,'Vizcaya','BI',1198),(2469,'Zamora','ZA',1198),(2470,'Zaragoza','Z',1198),(2471,'Ceuta','CE',1198),(2472,'Melilla','ML',1198),(2473,'Addis Ababa','AA',1070),(2474,'Dire Dawa','DD',1070),(2475,'Afar','AF',1070),(2476,'Amara','AM',1070),(2477,'Benshangul-Gumaz','BE',1070),(2478,'Gambela Peoples','GA',1070),(2479,'Harari People','HA',1070),(2480,'Oromia','OR',1070),(2481,'Somali','SO',1070),(2482,'Southern Nations, Nationalities and Peoples','SN',1070),(2483,'Tigrai','TI',1070),(2490,'Eastern','E',1074),(2491,'Northern','N',1074),(2492,'Western','W',1074),(2493,'Rotuma','R',1074),(2494,'Chuuk','TRK',1141),(2495,'Kosrae','KSA',1141),(2496,'Pohnpei','PNI',1141),(2497,'Yap','YAP',1141),(2498,'Ain','01',1076),(2499,'Aisne','02',1076),(2500,'Allier','03',1076),(2501,'Alpes-de-Haute-Provence','04',1076),(2502,'Alpes-Maritimes','06',1076),(2503,'Ardèche','07',1076),(2504,'Ardennes','08',1076),(2505,'Ariège','09',1076),(2506,'Aube','10',1076),(2507,'Aude','11',1076),(2508,'Aveyron','12',1076),(2509,'Bas-Rhin','67',1076),(2510,'Bouches-du-Rhône','13',1076),(2511,'Calvados','14',1076),(2512,'Cantal','15',1076),(2513,'Charente','16',1076),(2514,'Charente-Maritime','17',1076),(2515,'Cher','18',1076),(2516,'Corrèze','19',1076),(2517,'Corse-du-Sud','20A',1076),(2518,'Côte-d\'Or','21',1076),(2519,'Côtes-d\'Armor','22',1076),(2520,'Creuse','23',1076),(2521,'Deux-Sèvres','79',1076),(2522,'Dordogne','24',1076),(2523,'Doubs','25',1076),(2524,'Drôme','26',1076),(2525,'Essonne','91',1076),(2526,'Eure','27',1076),(2527,'Eure-et-Loir','28',1076),(2528,'Finistère','29',1076),(2529,'Gard','30',1076),(2530,'Gers','32',1076),(2531,'Gironde','33',1076),(2532,'Haut-Rhin','68',1076),(2533,'Haute-Corse','20B',1076),(2534,'Haute-Garonne','31',1076),(2535,'Haute-Loire','43',1076),(2536,'Haute-Saône','70',1076),(2537,'Haute-Savoie','74',1076),(2538,'Haute-Vienne','87',1076),(2539,'Hautes-Alpes','05',1076),(2540,'Hautes-Pyrénées','65',1076),(2541,'Hauts-de-Seine','92',1076),(2542,'Hérault','34',1076),(2543,'Indre','36',1076),(2544,'Ille-et-Vilaine','35',1076),(2545,'Indre-et-Loire','37',1076),(2546,'Isère','38',1076),(2547,'Landes','40',1076),(2548,'Loir-et-Cher','41',1076),(2549,'Loire','42',1076),(2550,'Loire-Atlantique','44',1076),(2551,'Loiret','45',1076),(2552,'Lot','46',1076),(2553,'Lot-et-Garonne','47',1076),(2554,'Lozère','48',1076),(2555,'Maine-et-Loire','49',1076),(2556,'Manche','50',1076),(2557,'Marne','51',1076),(2558,'Mayenne','53',1076),(2559,'Meurthe-et-Moselle','54',1076),(2560,'Meuse','55',1076),(2561,'Morbihan','56',1076),(2562,'Moselle','57',1076),(2563,'Nièvre','58',1076),(2564,'Nord','59',1076),(2565,'Oise','60',1076),(2566,'Orne','61',1076),(2567,'Paris','75',1076),(2568,'Pas-de-Calais','62',1076),(2569,'Puy-de-Dôme','63',1076),(2570,'Pyrénées-Atlantiques','64',1076),(2571,'Pyrénées-Orientales','66',1076),(2572,'Rhône','69',1076),(2573,'Saône-et-Loire','71',1076),(2574,'Sarthe','72',1076),(2575,'Savoie','73',1076),(2576,'Seine-et-Marne','77',1076),(2577,'Seine-Maritime','76',1076),(2578,'Seine-Saint-Denis','93',1076),(2579,'Somme','80',1076),(2580,'Tarn','81',1076),(2581,'Tarn-et-Garonne','82',1076),(2582,'Val d\'Oise','95',1076),(2583,'Territoire de Belfort','90',1076),(2584,'Val-de-Marne','94',1076),(2585,'Var','83',1076),(2586,'Vaucluse','84',1076),(2587,'Vendée','85',1076),(2588,'Vienne','86',1076),(2589,'Vosges','88',1076),(2590,'Yonne','89',1076),(2591,'Yvelines','78',1076),(2592,'Aberdeen City','ABE',1226),(2593,'Aberdeenshire','ABD',1226),(2594,'Angus','ANS',1226),(2595,'Co Antrim','ANT',1226),(2597,'Argyll and Bute','AGB',1226),(2598,'Co Armagh','ARM',1226),(2606,'Bedfordshire','BDF',1226),(2612,'Gwent','BGW',1226),(2620,'Bristol, City of','BST',1226),(2622,'Buckinghamshire','BKM',1226),(2626,'Cambridgeshire','CAM',1226),(2634,'Cheshire','CHS',1226),(2635,'Clackmannanshire','CLK',1226),(2639,'Cornwall','CON',1226),(2643,'Cumbria','CMA',1226),(2647,'Derbyshire','DBY',1226),(2648,'Co Londonderry','DRY',1226),(2649,'Devon','DEV',1226),(2651,'Dorset','DOR',1226),(2652,'Co Down','DOW',1226),(2654,'Dumfries and Galloway','DGY',1226),(2655,'Dundee City','DND',1226),(2657,'County Durham','DUR',1226),(2659,'East Ayrshire','EAY',1226),(2660,'East Dunbartonshire','EDU',1226),(2661,'East Lothian','ELN',1226),(2662,'East Renfrewshire','ERW',1226),(2663,'East Riding of Yorkshire','ERY',1226),(2664,'East Sussex','ESX',1226),(2665,'Edinburgh, City of','EDH',1226),(2666,'Na h-Eileanan Siar','ELS',1226),(2668,'Essex','ESS',1226),(2669,'Falkirk','FAL',1226),(2670,'Co Fermanagh','FER',1226),(2671,'Fife','FIF',1226),(2674,'Glasgow City','GLG',1226),(2675,'Gloucestershire','GLS',1226),(2678,'Gwynedd','GWN',1226),(2682,'Hampshire','HAM',1226),(2687,'Herefordshire','HEF',1226),(2688,'Hertfordshire','HRT',1226),(2689,'Highland','HED',1226),(2692,'Inverclyde','IVC',1226),(2694,'Isle of Wight','IOW',1226),(2699,'Kent','KEN',1226),(2705,'Lancashire','LAN',1226),(2709,'Leicestershire','LEC',1226),(2712,'Lincolnshire','LIN',1226),(2723,'Midlothian','MLN',1226),(2726,'Moray','MRY',1226),(2734,'Norfolk','NFK',1226),(2735,'North Ayrshire','NAY',1226),(2738,'North Lanarkshire','NLK',1226),(2742,'North Yorkshire','NYK',1226),(2743,'Northamptonshire','NTH',1226),(2744,'Northumberland','NBL',1226),(2746,'Nottinghamshire','NTT',1226),(2747,'Oldham','OLD',1226),(2748,'Omagh','OMH',1226),(2749,'Orkney Islands','ORR',1226),(2750,'Oxfordshire','OXF',1226),(2752,'Perth and Kinross','PKN',1226),(2757,'Powys','POW',1226),(2761,'Renfrewshire','RFW',1226),(2766,'Rutland','RUT',1226),(2770,'Scottish Borders','SCB',1226),(2773,'Shetland Islands','ZET',1226),(2774,'Shropshire','SHR',1226),(2777,'Somerset','SOM',1226),(2778,'South Ayrshire','SAY',1226),(2779,'South Gloucestershire','SGC',1226),(2780,'South Lanarkshire','SLK',1226),(2785,'Staffordshire','STS',1226),(2786,'Stirling','STG',1226),(2791,'Suffolk','SFK',1226),(2793,'Surrey','SRY',1226),(2804,'Mid Glamorgan','VGL',1226),(2811,'Warwickshire','WAR',1226),(2813,'West Dunbartonshire','WDU',1226),(2814,'West Lothian','WLN',1226),(2815,'West Sussex','WSX',1226),(2818,'Wiltshire','WIL',1226),(2823,'Worcestershire','WOR',1226),(2826,'Ashanti','AH',1083),(2827,'Brong-Ahafo','BA',1083),(2828,'Greater Accra','AA',1083),(2829,'Upper East','UE',1083),(2830,'Upper West','UW',1083),(2831,'Volta','TV',1083),(2832,'Banjul','B',1213),(2833,'Lower River','L',1213),(2834,'MacCarthy Island','M',1213),(2835,'North Bank','N',1213),(2836,'Upper River','U',1213),(2837,'Beyla','BE',1091),(2838,'Boffa','BF',1091),(2839,'Boke','BK',1091),(2840,'Coyah','CO',1091),(2841,'Dabola','DB',1091),(2842,'Dalaba','DL',1091),(2843,'Dinguiraye','DI',1091),(2844,'Dubreka','DU',1091),(2845,'Faranah','FA',1091),(2846,'Forecariah','FO',1091),(2847,'Fria','FR',1091),(2848,'Gaoual','GA',1091),(2849,'Guekedou','GU',1091),(2850,'Kankan','KA',1091),(2851,'Kerouane','KE',1091),(2852,'Kindia','KD',1091),(2853,'Kissidougou','KS',1091),(2854,'Koubia','KB',1091),(2855,'Koundara','KN',1091),(2856,'Kouroussa','KO',1091),(2857,'Labe','LA',1091),(2858,'Lelouma','LE',1091),(2859,'Lola','LO',1091),(2860,'Macenta','MC',1091),(2861,'Mali','ML',1091),(2862,'Mamou','MM',1091),(2863,'Mandiana','MD',1091),(2864,'Nzerekore','NZ',1091),(2865,'Pita','PI',1091),(2866,'Siguiri','SI',1091),(2867,'Telimele','TE',1091),(2868,'Tougue','TO',1091),(2869,'Yomou','YO',1091),(2870,'Region Continental','C',1067),(2871,'Region Insular','I',1067),(2872,'Annobon','AN',1067),(2873,'Bioko Norte','BN',1067),(2874,'Bioko Sur','BS',1067),(2875,'Centro Sur','CS',1067),(2876,'Kie-Ntem','KN',1067),(2877,'Litoral','LI',1067),(2878,'Wele-Nzas','WN',1067),(2879,'Achaïa','13',1085),(2880,'Aitolia-Akarnania','01',1085),(2881,'Argolis','11',1085),(2882,'Arkadia','12',1085),(2883,'Arta','31',1085),(2884,'Attiki','A1',1085),(2885,'Chalkidiki','64',1085),(2886,'Chania','94',1085),(2887,'Chios','85',1085),(2888,'Dodekanisos','81',1085),(2889,'Drama','52',1085),(2890,'Evros','71',1085),(2891,'Evrytania','05',1085),(2892,'Evvoia','04',1085),(2893,'Florina','63',1085),(2894,'Fokis','07',1085),(2895,'Fthiotis','06',1085),(2896,'Grevena','51',1085),(2897,'Ileia','14',1085),(2898,'Imathia','53',1085),(2899,'Ioannina','33',1085),(2900,'Irakleion','91',1085),(2901,'Karditsa','41',1085),(2902,'Kastoria','56',1085),(2903,'Kavalla','55',1085),(2904,'Kefallinia','23',1085),(2905,'Kerkyra','22',1085),(2906,'Kilkis','57',1085),(2907,'Korinthia','15',1085),(2908,'Kozani','58',1085),(2909,'Kyklades','82',1085),(2910,'Lakonia','16',1085),(2911,'Larisa','42',1085),(2912,'Lasithion','92',1085),(2913,'Lefkas','24',1085),(2914,'Lesvos','83',1085),(2915,'Magnisia','43',1085),(2916,'Messinia','17',1085),(2917,'Pella','59',1085),(2918,'Preveza','34',1085),(2919,'Rethymnon','93',1085),(2920,'Rodopi','73',1085),(2921,'Samos','84',1085),(2922,'Serrai','62',1085),(2923,'Thesprotia','32',1085),(2924,'Thessaloniki','54',1085),(2925,'Trikala','44',1085),(2926,'Voiotia','03',1085),(2927,'Xanthi','72',1085),(2928,'Zakynthos','21',1085),(2929,'Agio Oros','69',1085),(2930,'Alta Verapaz','AV',1090),(2931,'Baja Verapaz','BV',1090),(2932,'Chimaltenango','CM',1090),(2933,'Chiquimula','CQ',1090),(2934,'El Progreso','PR',1090),(2935,'Escuintla','ES',1090),(2936,'Guatemala','GU',1090),(2937,'Huehuetenango','HU',1090),(2938,'Izabal','IZ',1090),(2939,'Jalapa','JA',1090),(2940,'Jutiapa','JU',1090),(2941,'Peten','PE',1090),(2942,'Quetzaltenango','QZ',1090),(2943,'Quiche','QC',1090),(2944,'Retalhuleu','RE',1090),(2945,'Sacatepequez','SA',1090),(2946,'San Marcos','SM',1090),(2947,'Santa Rosa','SR',1090),(2948,'Sololá','SO',1090),(2949,'Suchitepequez','SU',1090),(2950,'Totonicapan','TO',1090),(2951,'Zacapa','ZA',1090),(2952,'Bissau','BS',1092),(2953,'Bafata','BA',1092),(2954,'Biombo','BM',1092),(2955,'Bolama','BL',1092),(2956,'Cacheu','CA',1092),(2957,'Gabu','GA',1092),(2958,'Oio','OI',1092),(2959,'Quloara','QU',1092),(2960,'Tombali S','TO',1092),(2961,'Barima-Waini','BA',1093),(2962,'Cuyuni-Mazaruni','CU',1093),(2963,'Demerara-Mahaica','DE',1093),(2964,'East Berbice-Corentyne','EB',1093),(2965,'Essequibo Islands-West Demerara','ES',1093),(2966,'Mahaica-Berbice','MA',1093),(2967,'Pomeroon-Supenaam','PM',1093),(2968,'Potaro-Siparuni','PT',1093),(2969,'Upper Demerara-Berbice','UD',1093),(2970,'Upper Takutu-Upper Essequibo','UT',1093),(2971,'Atlantida','AT',1097),(2972,'Colon','CL',1097),(2973,'Comayagua','CM',1097),(2974,'Copan','CP',1097),(2975,'Cortes','CR',1097),(2976,'Choluteca','CH',1097),(2977,'El Paraiso','EP',1097),(2978,'Francisco Morazan','FM',1097),(2979,'Gracias a Dios','GD',1097),(2980,'Intibuca','IN',1097),(2981,'Islas de la Bahia','IB',1097),(2982,'Lempira','LE',1097),(2983,'Ocotepeque','OC',1097),(2984,'Olancho','OL',1097),(2985,'Santa Barbara','SB',1097),(2986,'Valle','VA',1097),(2987,'Yoro','YO',1097),(2988,'Bjelovarsko-bilogorska zupanija','07',1055),(2989,'Brodsko-posavska zupanija','12',1055),(2990,'Dubrovacko-neretvanska zupanija','19',1055),(2991,'Istarska zupanija','18',1055),(2992,'Karlovacka zupanija','04',1055),(2993,'Koprivnickco-krizevacka zupanija','06',1055),(2994,'Krapinako-zagorska zupanija','02',1055),(2995,'Licko-senjska zupanija','09',1055),(2996,'Medimurska zupanija','20',1055),(2997,'Osjecko-baranjska zupanija','14',1055),(2998,'Pozesko-slavonska zupanija','11',1055),(2999,'Primorsko-goranska zupanija','08',1055),(3000,'Sisacko-moelavacka Iupanija','03',1055),(3001,'Splitako-dalmatinska zupanija','17',1055),(3002,'Sibenako-kninska zupanija','15',1055),(3003,'Varaidinska zupanija','05',1055),(3004,'VirovitiEko-podravska zupanija','10',1055),(3005,'VuRovarako-srijemska zupanija','16',1055),(3006,'Zadaraka','13',1055),(3007,'Zagrebacka zupanija','01',1055),(3008,'Grande-Anse','GA',1094),(3009,'Nord-Est','NE',1094),(3010,'Nord-Ouest','NO',1094),(3011,'Ouest','OU',1094),(3012,'Sud','SD',1094),(3013,'Sud-Est','SE',1094),(3014,'Budapest','BU',1099),(3015,'Bács-Kiskun','BK',1099),(3016,'Baranya','BA',1099),(3017,'Békés','BE',1099),(3018,'Borsod-Abaúj-Zemplén','BZ',1099),(3019,'Csongrád','CS',1099),(3020,'Fejér','FE',1099),(3021,'GyÅ‘r-Moson-Sopron','GS',1099),(3022,'Hajdu-Bihar','HB',1099),(3023,'Heves','HE',1099),(3024,'Jász-Nagykun-Szolnok','JN',1099),(3025,'Komárom-Esztergom','KE',1099),(3026,'Nográd','NO',1099),(3027,'Pest','PE',1099),(3028,'Somogy','SO',1099),(3029,'Szabolcs-Szatmár-Bereg','SZ',1099),(3030,'Tolna','TO',1099),(3031,'Vas','VA',1099),(3032,'Veszprém','VE',1099),(3033,'Zala','ZA',1099),(3034,'Békéscsaba','BC',1099),(3035,'Debrecen','DE',1099),(3036,'Dunaújváros','DU',1099),(3037,'Eger','EG',1099),(3038,'GyÅ‘r','GY',1099),(3039,'HódmezÅ‘vásárhely','HV',1099),(3040,'Kaposvár','KV',1099),(3041,'Kecskemét','KM',1099),(3042,'Miskolc','MI',1099),(3043,'Nagykanizsa','NK',1099),(3044,'Nyiregyháza','NY',1099),(3045,'Pécs','PS',1099),(3046,'Salgótarján','ST',1099),(3047,'Sopron','SN',1099),(3048,'Szeged','SD',1099),(3049,'Székesfehérvár','SF',1099),(3050,'Szekszárd','SS',1099),(3051,'Szolnok','SK',1099),(3052,'Szombathely','SH',1099),(3053,'Tatabánya','TB',1099),(3054,'Zalaegerszeg','ZE',1099),(3055,'Bali','BA',1102),(3056,'Kepulauan Bangka Belitung','BB',1102),(3057,'Banten','BT',1102),(3058,'Bengkulu','BE',1102),(3059,'Gorontalo','GO',1102),(3060,'Papua Barat','PB',1102),(3061,'Jambi','JA',1102),(3062,'Jawa Barat','JB',1102),(3063,'Jawa Tengah','JT',1102),(3064,'Jawa Timur','JI',1102),(3065,'Kalimantan Barat','KB',1102),(3066,'Kalimantan Timur','KI',1102),(3067,'Kalimantan Selatan','KS',1102),(3068,'Kepulauan Riau','KR',1102),(3069,'Lampung','LA',1102),(3070,'Maluku','MA',1102),(3071,'Maluku Utara','MU',1102),(3072,'Nusa Tenggara Barat','NB',1102),(3073,'Nusa Tenggara Timur','NT',1102),(3074,'Papua','PA',1102),(3075,'Riau','RI',1102),(3076,'Sulawesi Selatan','SN',1102),(3077,'Sulawesi Tengah','ST',1102),(3078,'Sulawesi Tenggara','SG',1102),(3079,'Sulawesi Utara','SA',1102),(3080,'Sumatra Barat','SB',1102),(3081,'Sumatra Selatan','SS',1102),(3082,'Sumatera Utara','SU',1102),(3083,'DKI Jakarta','JK',1102),(3084,'Aceh','AC',1102),(3085,'DI Yogyakarta','YO',1102),(3086,'Cork','C',1105),(3087,'Clare','CE',1105),(3088,'Cavan','CN',1105),(3089,'Carlow','CW',1105),(3090,'Dublin','D',1105),(3091,'Donegal','DL',1105),(3092,'Galway','G',1105),(3093,'Kildare','KE',1105),(3094,'Kilkenny','KK',1105),(3095,'Kerry','KY',1105),(3096,'Longford','LD',1105),(3097,'Louth','LH',1105),(3098,'Limerick','LK',1105),(3099,'Leitrim','LM',1105),(3100,'Laois','LS',1105),(3101,'Meath','MH',1105),(3102,'Monaghan','MN',1105),(3103,'Mayo','MO',1105),(3104,'Offaly','OY',1105),(3105,'Roscommon','RN',1105),(3106,'Sligo','SO',1105),(3107,'Tipperary','TA',1105),(3108,'Waterford','WD',1105),(3109,'Westmeath','WH',1105),(3110,'Wicklow','WW',1105),(3111,'Wexford','WX',1105),(3112,'HaDarom','D',1106),(3113,'HaMerkaz','M',1106),(3114,'HaZafon','Z',1106),(3115,'Haifa','HA',1106),(3116,'Tel-Aviv','TA',1106),(3117,'Jerusalem','JM',1106),(3118,'Al Anbar','AN',1104),(3119,'Al Ba,rah','BA',1104),(3120,'Al Muthanna','MU',1104),(3121,'Al Qadisiyah','QA',1104),(3122,'An Najef','NA',1104),(3123,'Arbil','AR',1104),(3124,'As Sulaymaniyah','SW',1104),(3125,'At Ta\'mim','TS',1104),(3126,'Babil','BB',1104),(3127,'Baghdad','BG',1104),(3128,'Dahuk','DA',1104),(3129,'Dhi Qar','DQ',1104),(3130,'Diyala','DI',1104),(3131,'Karbala\'','KA',1104),(3132,'Maysan','MA',1104),(3133,'Ninawa','NI',1104),(3134,'Salah ad Din','SD',1104),(3135,'Wasit','WA',1104),(3136,'Ardabil','03',1103),(3137,'Azarbayjan-e Gharbi','02',1103),(3138,'Azarbayjan-e Sharqi','01',1103),(3139,'Bushehr','06',1103),(3140,'Chahar Mahall va Bakhtiari','08',1103),(3141,'Esfahan','04',1103),(3142,'Fars','14',1103),(3143,'Gilan','19',1103),(3144,'Golestan','27',1103),(3145,'Hamadan','24',1103),(3146,'Hormozgan','23',1103),(3147,'Iiam','05',1103),(3148,'Kerman','15',1103),(3149,'Kermanshah','17',1103),(3150,'Khorasan','09',1103),(3151,'Khuzestan','10',1103),(3152,'Kohjiluyeh va Buyer Ahmad','18',1103),(3153,'Kordestan','16',1103),(3154,'Lorestan','20',1103),(3155,'Markazi','22',1103),(3156,'Mazandaran','21',1103),(3157,'Qazvin','28',1103),(3158,'Qom','26',1103),(3159,'Semnan','12',1103),(3160,'Sistan va Baluchestan','13',1103),(3161,'Tehran','07',1103),(3162,'Yazd','25',1103),(3163,'Zanjan','11',1103),(3164,'Austurland','7',1100),(3165,'Hofuoborgarsvaeoi utan Reykjavikur','1',1100),(3166,'Norourland eystra','6',1100),(3167,'Norourland vestra','5',1100),(3168,'Reykjavik','0',1100),(3169,'Suourland','8',1100),(3170,'Suournes','2',1100),(3171,'Vestfirolr','4',1100),(3172,'Vesturland','3',1100),(3173,'Agrigento','AG',1107),(3174,'Alessandria','AL',1107),(3175,'Ancona','AN',1107),(3176,'Aosta','AO',1107),(3177,'Arezzo','AR',1107),(3178,'Ascoli Piceno','AP',1107),(3179,'Asti','AT',1107),(3180,'Avellino','AV',1107),(3181,'Bari','BA',1107),(3182,'Belluno','BL',1107),(3183,'Benevento','BN',1107),(3184,'Bergamo','BG',1107),(3185,'Biella','BI',1107),(3186,'Bologna','BO',1107),(3187,'Bolzano','BZ',1107),(3188,'Brescia','BS',1107),(3189,'Brindisi','BR',1107),(3190,'Cagliari','CA',1107),(3191,'Caltanissetta','CL',1107),(3192,'Campobasso','CB',1107),(3193,'Caserta','CE',1107),(3194,'Catania','CT',1107),(3195,'Catanzaro','CZ',1107),(3196,'Chieti','CH',1107),(3197,'Como','CO',1107),(3198,'Cosenza','CS',1107),(3199,'Cremona','CR',1107),(3200,'Crotone','KR',1107),(3201,'Cuneo','CN',1107),(3202,'Enna','EN',1107),(3203,'Ferrara','FE',1107),(3204,'Firenze','FI',1107),(3205,'Foggia','FG',1107),(3206,'Forlì-Cesena','FC',1107),(3207,'Frosinone','FR',1107),(3208,'Genova','GE',1107),(3209,'Gorizia','GO',1107),(3210,'Grosseto','GR',1107),(3211,'Imperia','IM',1107),(3212,'Isernia','IS',1107),(3213,'L\'Aquila','AQ',1107),(3214,'La Spezia','SP',1107),(3215,'Latina','LT',1107),(3216,'Lecce','LE',1107),(3217,'Lecco','LC',1107),(3218,'Livorno','LI',1107),(3219,'Lodi','LO',1107),(3220,'Lucca','LU',1107),(3221,'Macerata','MC',1107),(3222,'Mantova','MN',1107),(3223,'Massa-Carrara','MS',1107),(3224,'Matera','MT',1107),(3225,'Messina','ME',1107),(3226,'Milano','MI',1107),(3227,'Modena','MO',1107),(3228,'Napoli','NA',1107),(3229,'Novara','NO',1107),(3230,'Nuoro','NU',1107),(3231,'Oristano','OR',1107),(3232,'Padova','PD',1107),(3233,'Palermo','PA',1107),(3234,'Parma','PR',1107),(3235,'Pavia','PV',1107),(3236,'Perugia','PG',1107),(3237,'Pesaro e Urbino','PU',1107),(3238,'Pescara','PE',1107),(3239,'Piacenza','PC',1107),(3240,'Pisa','PI',1107),(3241,'Pistoia','PT',1107),(3242,'Pordenone','PN',1107),(3243,'Potenza','PZ',1107),(3244,'Prato','PO',1107),(3245,'Ragusa','RG',1107),(3246,'Ravenna','RA',1107),(3247,'Reggio Calabria','RC',1107),(3248,'Reggio Emilia','RE',1107),(3249,'Rieti','RI',1107),(3250,'Rimini','RN',1107),(3251,'Roma','RM',1107),(3252,'Rovigo','RO',1107),(3253,'Salerno','SA',1107),(3254,'Sassari','SS',1107),(3255,'Savona','SV',1107),(3256,'Siena','SI',1107),(3257,'Siracusa','SR',1107),(3258,'Sondrio','SO',1107),(3259,'Taranto','TA',1107),(3260,'Teramo','TE',1107),(3261,'Terni','TR',1107),(3262,'Torino','TO',1107),(3263,'Trapani','TP',1107),(3264,'Trento','TN',1107),(3265,'Treviso','TV',1107),(3266,'Trieste','TS',1107),(3267,'Udine','UD',1107),(3268,'Varese','VA',1107),(3269,'Venezia','VE',1107),(3270,'Verbano-Cusio-Ossola','VB',1107),(3271,'Vercelli','VC',1107),(3272,'Verona','VR',1107),(3273,'Vibo Valentia','VV',1107),(3274,'Vicenza','VI',1107),(3275,'Viterbo','VT',1107),(3276,'Aichi','23',1109),(3277,'Akita','05',1109),(3278,'Aomori','02',1109),(3279,'Chiba','12',1109),(3280,'Ehime','38',1109),(3281,'Fukui','18',1109),(3282,'Fukuoka','40',1109),(3283,'Fukusima','07',1109),(3284,'Gifu','21',1109),(3285,'Gunma','10',1109),(3286,'Hiroshima','34',1109),(3287,'Hokkaido','01',1109),(3288,'Hyogo','28',1109),(3289,'Ibaraki','08',1109),(3290,'Ishikawa','17',1109),(3291,'Iwate','03',1109),(3292,'Kagawa','37',1109),(3293,'Kagoshima','46',1109),(3294,'Kanagawa','14',1109),(3295,'Kochi','39',1109),(3296,'Kumamoto','43',1109),(3297,'Kyoto','26',1109),(3298,'Mie','24',1109),(3299,'Miyagi','04',1109),(3300,'Miyazaki','45',1109),(3301,'Nagano','20',1109),(3302,'Nagasaki','42',1109),(3303,'Nara','29',1109),(3304,'Niigata','15',1109),(3305,'Oita','44',1109),(3306,'Okayama','33',1109),(3307,'Okinawa','47',1109),(3308,'Osaka','27',1109),(3309,'Saga','41',1109),(3310,'Saitama','11',1109),(3311,'Shiga','25',1109),(3312,'Shimane','32',1109),(3313,'Shizuoka','22',1109),(3314,'Tochigi','09',1109),(3315,'Tokushima','36',1109),(3316,'Tokyo','13',1109),(3317,'Tottori','31',1109),(3318,'Toyama','16',1109),(3319,'Wakayama','30',1109),(3320,'Yamagata','06',1109),(3321,'Yamaguchi','35',1109),(3322,'Yamanashi','19',1109),(3323,'Clarendon','CN',1108),(3324,'Hanover','HR',1108),(3325,'Kingston','KN',1108),(3326,'Portland','PD',1108),(3327,'Saint Andrew','AW',1108),(3328,'Saint Ann','AN',1108),(3329,'Saint Catherine','CE',1108),(3330,'Saint Elizabeth','EH',1108),(3331,'Saint James','JS',1108),(3332,'Saint Mary','MY',1108),(3333,'Saint Thomas','TS',1108),(3334,'Trelawny','TY',1108),(3335,'Westmoreland','WD',1108),(3336,'Ajln','AJ',1110),(3337,'Al \'Aqaba','AQ',1110),(3338,'Al Balqa\'','BA',1110),(3339,'Al Karak','KA',1110),(3340,'Al Mafraq','MA',1110),(3341,'Amman','AM',1110),(3342,'At Tafilah','AT',1110),(3343,'Az Zarga','AZ',1110),(3344,'Irbid','JR',1110),(3345,'Jarash','JA',1110),(3346,'Ma\'an','MN',1110),(3347,'Madaba','MD',1110),(3353,'Bishkek','GB',1117),(3354,'Batken','B',1117),(3355,'Chu','C',1117),(3356,'Jalal-Abad','J',1117),(3357,'Naryn','N',1117),(3358,'Osh','O',1117),(3359,'Talas','T',1117),(3360,'Ysyk-Kol','Y',1117),(3361,'Krong Kaeb','23',1037),(3362,'Krong Pailin','24',1037),(3363,'Xrong Preah Sihanouk','18',1037),(3364,'Phnom Penh','12',1037),(3365,'Baat Dambang','2',1037),(3366,'Banteay Mean Chey','1',1037),(3367,'Rampong Chaam','3',1037),(3368,'Kampong Chhnang','4',1037),(3369,'Kampong Spueu','5',1037),(3370,'Kampong Thum','6',1037),(3371,'Kampot','7',1037),(3372,'Kandaal','8',1037),(3373,'Kach Kong','9',1037),(3374,'Krachoh','10',1037),(3375,'Mondol Kiri','11',1037),(3376,'Otdar Mean Chey','22',1037),(3377,'Pousaat','15',1037),(3378,'Preah Vihear','13',1037),(3379,'Prey Veaeng','14',1037),(3380,'Rotanak Kiri','16',1037),(3381,'Siem Reab','17',1037),(3382,'Stueng Traeng','19',1037),(3383,'Svaay Rieng','20',1037),(3384,'Taakaev','21',1037),(3385,'Gilbert Islands','G',1113),(3386,'Line Islands','L',1113),(3387,'Phoenix Islands','P',1113),(3388,'Anjouan Ndzouani','A',1049),(3389,'Grande Comore Ngazidja','G',1049),(3390,'Moheli Moili','M',1049),(3391,'Kaesong-si','KAE',1114),(3392,'Nampo-si','NAM',1114),(3393,'Pyongyang-ai','PYO',1114),(3394,'Chagang-do','CHA',1114),(3395,'Hamgyongbuk-do','HAB',1114),(3396,'Hamgyongnam-do','HAN',1114),(3397,'Hwanghaebuk-do','HWB',1114),(3398,'Hwanghaenam-do','HWN',1114),(3399,'Kangwon-do','KAN',1114),(3400,'Pyonganbuk-do','PYB',1114),(3401,'Pyongannam-do','PYN',1114),(3402,'Yanggang-do','YAN',1114),(3403,'Najin Sonbong-si','NAJ',1114),(3404,'Seoul Teugbyeolsi','11',1115),(3405,'Busan Gwang\'yeogsi','26',1115),(3406,'Daegu Gwang\'yeogsi','27',1115),(3407,'Daejeon Gwang\'yeogsi','30',1115),(3408,'Gwangju Gwang\'yeogsi','29',1115),(3409,'Incheon Gwang\'yeogsi','28',1115),(3410,'Ulsan Gwang\'yeogsi','31',1115),(3411,'Chungcheongbugdo','43',1115),(3412,'Chungcheongnamdo','44',1115),(3413,'Gang\'weondo','42',1115),(3414,'Gyeonggido','41',1115),(3415,'Gyeongsangbugdo','47',1115),(3416,'Gyeongsangnamdo','48',1115),(3417,'Jejudo','49',1115),(3418,'Jeonrabugdo','45',1115),(3419,'Jeonranamdo','46',1115),(3420,'Al Ahmadi','AH',1116),(3421,'Al Farwanlyah','FA',1116),(3422,'Al Jahrah','JA',1116),(3423,'Al Kuwayt','KU',1116),(3424,'Hawalli','HA',1116),(3425,'Almaty','ALA',1111),(3426,'Astana','AST',1111),(3427,'Almaty oblysy','ALM',1111),(3428,'Aqmola oblysy','AKM',1111),(3429,'Aqtobe oblysy','AKT',1111),(3430,'Atyrau oblyfiy','ATY',1111),(3431,'Batys Quzaqstan oblysy','ZAP',1111),(3432,'Mangghystau oblysy','MAN',1111),(3433,'Ongtustik Quzaqstan oblysy','YUZ',1111),(3434,'Pavlodar oblysy','PAV',1111),(3435,'Qaraghandy oblysy','KAR',1111),(3436,'Qostanay oblysy','KUS',1111),(3437,'Qyzylorda oblysy','KZY',1111),(3438,'Shyghys Quzaqstan oblysy','VOS',1111),(3439,'Soltustik Quzaqstan oblysy','SEV',1111),(3440,'Zhambyl oblysy Zhambylskaya oblast\'','ZHA',1111),(3441,'Vientiane','VT',1118),(3442,'Attapu','AT',1118),(3443,'Bokeo','BK',1118),(3444,'Bolikhamxai','BL',1118),(3445,'Champasak','CH',1118),(3446,'Houaphan','HO',1118),(3447,'Khammouan','KH',1118),(3448,'Louang Namtha','LM',1118),(3449,'Louangphabang','LP',1118),(3450,'Oudomxai','OU',1118),(3451,'Phongsali','PH',1118),(3452,'Salavan','SL',1118),(3453,'Savannakhet','SV',1118),(3454,'Xaignabouli','XA',1118),(3455,'Xiasomboun','XN',1118),(3456,'Xekong','XE',1118),(3457,'Xiangkhoang','XI',1118),(3458,'Beirut','BA',1120),(3459,'Beqaa','BI',1120),(3460,'Mount Lebanon','JL',1120),(3461,'North Lebanon','AS',1120),(3462,'South Lebanon','JA',1120),(3463,'Nabatieh','NA',1120),(3464,'Ampara','52',1199),(3465,'Anuradhapura','71',1199),(3466,'Badulla','81',1199),(3467,'Batticaloa','51',1199),(3468,'Colombo','11',1199),(3469,'Galle','31',1199),(3470,'Gampaha','12',1199),(3471,'Hambantota','33',1199),(3472,'Jaffna','41',1199),(3473,'Kalutara','13',1199),(3474,'Kandy','21',1199),(3475,'Kegalla','92',1199),(3476,'Kilinochchi','42',1199),(3477,'Kurunegala','61',1199),(3478,'Mannar','43',1199),(3479,'Matale','22',1199),(3480,'Matara','32',1199),(3481,'Monaragala','82',1199),(3482,'Mullaittivu','45',1199),(3483,'Nuwara Eliya','23',1199),(3484,'Polonnaruwa','72',1199),(3485,'Puttalum','62',1199),(3486,'Ratnapura','91',1199),(3487,'Trincomalee','53',1199),(3488,'VavunLya','44',1199),(3489,'Bomi','BM',1122),(3490,'Bong','BG',1122),(3491,'Grand Basaa','GB',1122),(3492,'Grand Cape Mount','CM',1122),(3493,'Grand Gedeh','GG',1122),(3494,'Grand Kru','GK',1122),(3495,'Lofa','LO',1122),(3496,'Margibi','MG',1122),(3497,'Maryland','MY',1122),(3498,'Montserrado','MO',1122),(3499,'Nimba','NI',1122),(3500,'Rivercess','RI',1122),(3501,'Sinoe','SI',1122),(3502,'Berea','D',1121),(3503,'Butha-Buthe','B',1121),(3504,'Leribe','C',1121),(3505,'Mafeteng','E',1121),(3506,'Maseru','A',1121),(3507,'Mohale\'s Hoek','F',1121),(3508,'Mokhotlong','J',1121),(3509,'Qacha\'s Nek','H',1121),(3510,'Quthing','G',1121),(3511,'Thaba-Tseka','K',1121),(3512,'Alytaus Apskritis','AL',1125),(3513,'Kauno Apskritis','KU',1125),(3514,'KlaipÄ—dos Apskritis','KL',1125),(3515,'MarijampolÄ—s Apskritis','MR',1125),(3516,'Panevėžio Apskritis','PN',1125),(3517,'Å iaulių Apskritis','SA',1125),(3518,'TauragÄ—s Apskritis','TA',1125),(3519,'TelÅ¡ių Apskritis','TE',1125),(3520,'Utenos Apskritis','UT',1125),(3521,'Vilniaus Apskritis','VL',1125),(3522,'Diekirch','D',1126),(3523,'GreveNmacher','G',1126),(3550,'Daugavpils','DGV',1119),(3551,'Jelgava','JEL',1119),(3552,'JÅ«rmala','JUR',1119),(3553,'LiepÄja','LPX',1119),(3554,'RÄ“zekne','REZ',1119),(3555,'RÄ«ga','RIX',1119),(3556,'Ventspils','VEN',1119),(3557,'AjdÄbiyÄ','AJ',1123),(3558,'Al BuÅ£nÄn','BU',1123),(3559,'Al HizÄm al Akhdar','HZ',1123),(3560,'Al Jabal al Akhdar','JA',1123),(3561,'Al JifÄrah','JI',1123),(3562,'Al Jufrah','JU',1123),(3563,'Al Kufrah','KF',1123),(3564,'Al Marj','MJ',1123),(3565,'Al Marqab','MB',1123),(3566,'Al QaÅ£rÅ«n','QT',1123),(3567,'Al Qubbah','QB',1123),(3568,'Al WÄhah','WA',1123),(3569,'An NuqaÅ£ al Khams','NQ',1123),(3570,'Ash ShÄÅ£i\'','SH',1123),(3571,'Az ZÄwiyah','ZA',1123),(3572,'BanghÄzÄ«','BA',1123),(3573,'BanÄ« WalÄ«d','BW',1123),(3574,'Darnah','DR',1123),(3575,'GhadÄmis','GD',1123),(3576,'GharyÄn','GR',1123),(3577,'GhÄt','GT',1123),(3578,'JaghbÅ«b','JB',1123),(3579,'MiÅŸrÄtah','MI',1123),(3580,'Mizdah','MZ',1123),(3581,'Murzuq','MQ',1123),(3582,'NÄlÅ«t','NL',1123),(3583,'SabhÄ','SB',1123),(3584,'ÅžabrÄtah ÅžurmÄn','SS',1123),(3585,'Surt','SR',1123),(3586,'TÄjÅ«rÄ\' wa an NawÄhÄ« al ArbÄh','TN',1123),(3587,'Å¢arÄbulus','TB',1123),(3588,'TarhÅ«nah-MasallÄtah','TM',1123),(3589,'WÄdÄ« al hayÄt','WD',1123),(3590,'Yafran-JÄdÅ«','YJ',1123),(3591,'Agadir','AGD',1146),(3592,'Aït Baha','BAH',1146),(3593,'Aït Melloul','MEL',1146),(3594,'Al Haouz','HAO',1146),(3595,'Al Hoceïma','HOC',1146),(3596,'Assa-Zag','ASZ',1146),(3597,'Azilal','AZI',1146),(3598,'Beni Mellal','BEM',1146),(3599,'Ben Sllmane','BES',1146),(3600,'Berkane','BER',1146),(3601,'Boujdour','BOD',1146),(3602,'Boulemane','BOM',1146),(3603,'Casablanca [Dar el Beïda]','CAS',1146),(3604,'Chefchaouene','CHE',1146),(3605,'Chichaoua','CHI',1146),(3606,'El Hajeb','HAJ',1146),(3607,'El Jadida','JDI',1146),(3608,'Errachidia','ERR',1146),(3609,'Essaouira','ESI',1146),(3610,'Es Smara','ESM',1146),(3611,'Fès','FES',1146),(3612,'Figuig','FIG',1146),(3613,'Guelmim','GUE',1146),(3614,'Ifrane','IFR',1146),(3615,'Jerada','JRA',1146),(3616,'Kelaat Sraghna','KES',1146),(3617,'Kénitra','KEN',1146),(3618,'Khemisaet','KHE',1146),(3619,'Khenifra','KHN',1146),(3620,'Khouribga','KHO',1146),(3621,'Laâyoune (EH)','LAA',1146),(3622,'Larache','LAP',1146),(3623,'Marrakech','MAR',1146),(3624,'Meknsès','MEK',1146),(3625,'Nador','NAD',1146),(3626,'Ouarzazate','OUA',1146),(3627,'Oued ed Dahab (EH)','OUD',1146),(3628,'Oujda','OUJ',1146),(3629,'Rabat-Salé','RBA',1146),(3630,'Safi','SAF',1146),(3631,'Sefrou','SEF',1146),(3632,'Settat','SET',1146),(3633,'Sidl Kacem','SIK',1146),(3634,'Tanger','TNG',1146),(3635,'Tan-Tan','TNT',1146),(3636,'Taounate','TAO',1146),(3637,'Taroudannt','TAR',1146),(3638,'Tata','TAT',1146),(3639,'Taza','TAZ',1146),(3640,'Tétouan','TET',1146),(3641,'Tiznit','TIZ',1146),(3642,'Gagauzia, Unitate Teritoriala Autonoma','GA',1142),(3643,'Chisinau','CU',1142),(3644,'Stinga Nistrului, unitatea teritoriala din','SN',1142),(3645,'Balti','BA',1142),(3646,'Cahul','CA',1142),(3647,'Edinet','ED',1142),(3648,'Lapusna','LA',1142),(3649,'Orhei','OR',1142),(3650,'Soroca','SO',1142),(3651,'Taraclia','TA',1142),(3652,'Tighina [Bender]','TI',1142),(3653,'Ungheni','UN',1142),(3654,'Antananarivo','T',1129),(3655,'Antsiranana','D',1129),(3656,'Fianarantsoa','F',1129),(3657,'Mahajanga','M',1129),(3658,'Toamasina','A',1129),(3659,'Toliara','U',1129),(3660,'Ailinglapalap','ALL',1135),(3661,'Ailuk','ALK',1135),(3662,'Arno','ARN',1135),(3663,'Aur','AUR',1135),(3664,'Ebon','EBO',1135),(3665,'Eniwetok','ENI',1135),(3666,'Jaluit','JAL',1135),(3667,'Kili','KIL',1135),(3668,'Kwajalein','KWA',1135),(3669,'Lae','LAE',1135),(3670,'Lib','LIB',1135),(3671,'Likiep','LIK',1135),(3672,'Majuro','MAJ',1135),(3673,'Maloelap','MAL',1135),(3674,'Mejit','MEJ',1135),(3675,'Mili','MIL',1135),(3676,'Namorik','NMK',1135),(3677,'Namu','NMU',1135),(3678,'Rongelap','RON',1135),(3679,'Ujae','UJA',1135),(3680,'Ujelang','UJL',1135),(3681,'Utirik','UTI',1135),(3682,'Wotho','WTN',1135),(3683,'Wotje','WTJ',1135),(3684,'Bamako','BK0',1133),(3685,'Gao','7',1133),(3686,'Kayes','1',1133),(3687,'Kidal','8',1133),(3688,'Xoulikoro','2',1133),(3689,'Mopti','5',1133),(3690,'S69ou','4',1133),(3691,'Sikasso','3',1133),(3692,'Tombouctou','6',1133),(3693,'Ayeyarwady','07',1035),(3694,'Bago','02',1035),(3695,'Magway','03',1035),(3696,'Mandalay','04',1035),(3697,'Sagaing','01',1035),(3698,'Tanintharyi','05',1035),(3699,'Yangon','06',1035),(3700,'Chin','14',1035),(3701,'Kachin','11',1035),(3702,'Kayah','12',1035),(3703,'Kayin','13',1035),(3704,'Mon','15',1035),(3705,'Rakhine','16',1035),(3706,'Shan','17',1035),(3707,'Ulaanbaatar','1',1144),(3708,'Arhangay','073',1144),(3709,'Bayanhongor','069',1144),(3710,'Bayan-Olgiy','071',1144),(3711,'Bulgan','067',1144),(3712,'Darhan uul','037',1144),(3713,'Dornod','061',1144),(3714,'Dornogov,','063',1144),(3715,'DundgovL','059',1144),(3716,'Dzavhan','057',1144),(3717,'Govi-Altay','065',1144),(3718,'Govi-Smber','064',1144),(3719,'Hentiy','039',1144),(3720,'Hovd','043',1144),(3721,'Hovsgol','041',1144),(3722,'Omnogovi','053',1144),(3723,'Orhon','035',1144),(3724,'Ovorhangay','055',1144),(3725,'Selenge','049',1144),(3726,'Shbaatar','051',1144),(3727,'Tov','047',1144),(3728,'Uvs','046',1144),(3729,'Nouakchott','NKC',1137),(3730,'Assaba','03',1137),(3731,'Brakna','05',1137),(3732,'Dakhlet Nouadhibou','08',1137),(3733,'Gorgol','04',1137),(3734,'Guidimaka','10',1137),(3735,'Hodh ech Chargui','01',1137),(3736,'Hodh el Charbi','02',1137),(3737,'Inchiri','12',1137),(3738,'Tagant','09',1137),(3739,'Tiris Zemmour','11',1137),(3740,'Trarza','06',1137),(3741,'Beau Bassin-Rose Hill','BR',1138),(3742,'Curepipe','CU',1138),(3743,'Port Louis','PU',1138),(3744,'Quatre Bornes','QB',1138),(3745,'Vacosa-Phoenix','VP',1138),(3746,'Black River','BL',1138),(3747,'Flacq','FL',1138),(3748,'Grand Port','GP',1138),(3749,'Moka','MO',1138),(3750,'Pamplemousses','PA',1138),(3751,'Plaines Wilhems','PW',1138),(3752,'Riviere du Rempart','RP',1138),(3753,'Savanne','SA',1138),(3754,'Agalega Islands','AG',1138),(3755,'Cargados Carajos Shoals','CC',1138),(3756,'Rodrigues Island','RO',1138),(3757,'Male','MLE',1132),(3758,'Alif','02',1132),(3759,'Baa','20',1132),(3760,'Dhaalu','17',1132),(3761,'Faafu','14',1132),(3762,'Gaaf Alif','27',1132),(3763,'Gaefu Dhaalu','28',1132),(3764,'Gnaviyani','29',1132),(3765,'Haa Alif','07',1132),(3766,'Haa Dhaalu','23',1132),(3767,'Kaafu','26',1132),(3768,'Laamu','05',1132),(3769,'Lhaviyani','03',1132),(3770,'Meemu','12',1132),(3771,'Noonu','25',1132),(3772,'Raa','13',1132),(3773,'Seenu','01',1132),(3774,'Shaviyani','24',1132),(3775,'Thaa','08',1132),(3776,'Vaavu','04',1132),(3777,'Balaka','BA',1130),(3778,'Blantyre','BL',1130),(3779,'Chikwawa','CK',1130),(3780,'Chiradzulu','CR',1130),(3781,'Chitipa','CT',1130),(3782,'Dedza','DE',1130),(3783,'Dowa','DO',1130),(3784,'Karonga','KR',1130),(3785,'Kasungu','KS',1130),(3786,'Likoma Island','LK',1130),(3787,'Lilongwe','LI',1130),(3788,'Machinga','MH',1130),(3789,'Mangochi','MG',1130),(3790,'Mchinji','MC',1130),(3791,'Mulanje','MU',1130),(3792,'Mwanza','MW',1130),(3793,'Mzimba','MZ',1130),(3794,'Nkhata Bay','NB',1130),(3795,'Nkhotakota','NK',1130),(3796,'Nsanje','NS',1130),(3797,'Ntcheu','NU',1130),(3798,'Ntchisi','NI',1130),(3799,'Phalomba','PH',1130),(3800,'Rumphi','RU',1130),(3801,'Salima','SA',1130),(3802,'Thyolo','TH',1130),(3803,'Zomba','ZO',1130),(3804,'Aguascalientes','AGU',1140),(3805,'Baja California','BCN',1140),(3806,'Baja California Sur','BCS',1140),(3807,'Campeche','CAM',1140),(3808,'Coahuila','COA',1140),(3809,'Colima','COL',1140),(3810,'Chiapas','CHP',1140),(3811,'Chihuahua','CHH',1140),(3812,'Durango','DUR',1140),(3813,'Guanajuato','GUA',1140),(3814,'Guerrero','GRO',1140),(3815,'Hidalgo','HID',1140),(3816,'Jalisco','JAL',1140),(3817,'Mexico','MEX',1140),(3818,'Michoacin','MIC',1140),(3819,'Morelos','MOR',1140),(3820,'Nayarit','NAY',1140),(3821,'Nuevo Leon','NLE',1140),(3822,'Oaxaca','OAX',1140),(3823,'Puebla','PUE',1140),(3824,'Queretaro','QUE',1140),(3825,'Quintana Roo','ROO',1140),(3826,'San Luis Potosi','SLP',1140),(3827,'Sinaloa','SIN',1140),(3828,'Sonora','SON',1140),(3829,'Tabasco','TAB',1140),(3830,'Tamaulipas','TAM',1140),(3831,'Tlaxcala','TLA',1140),(3832,'Veracruz','VER',1140),(3833,'Yucatan','YUC',1140),(3834,'Zacatecas','ZAC',1140),(3835,'Wilayah Persekutuan Kuala Lumpur','14',1131),(3836,'Wilayah Persekutuan Labuan','15',1131),(3837,'Wilayah Persekutuan Putrajaya','16',1131),(3838,'Johor','01',1131),(3839,'Kedah','02',1131),(3840,'Kelantan','03',1131),(3841,'Melaka','04',1131),(3842,'Negeri Sembilan','05',1131),(3843,'Pahang','06',1131),(3844,'Perak','08',1131),(3845,'Perlis','09',1131),(3846,'Pulau Pinang','07',1131),(3847,'Sabah','12',1131),(3848,'Sarawak','13',1131),(3849,'Selangor','10',1131),(3850,'Terengganu','11',1131),(3851,'Maputo','MPM',1147),(3852,'Cabo Delgado','P',1147),(3853,'Gaza','G',1147),(3854,'Inhambane','I',1147),(3855,'Manica','B',1147),(3856,'Numpula','N',1147),(3857,'Niaaea','A',1147),(3858,'Sofala','S',1147),(3859,'Tete','T',1147),(3860,'Zambezia','Q',1147),(3861,'Caprivi','CA',1148),(3862,'Erongo','ER',1148),(3863,'Hardap','HA',1148),(3864,'Karas','KA',1148),(3865,'Khomas','KH',1148),(3866,'Kunene','KU',1148),(3867,'Ohangwena','OW',1148),(3868,'Okavango','OK',1148),(3869,'Omaheke','OH',1148),(3870,'Omusati','OS',1148),(3871,'Oshana','ON',1148),(3872,'Oshikoto','OT',1148),(3873,'Otjozondjupa','OD',1148),(3874,'Niamey','8',1156),(3875,'Agadez','1',1156),(3876,'Diffa','2',1156),(3877,'Dosso','3',1156),(3878,'Maradi','4',1156),(3879,'Tahoua','S',1156),(3880,'Tillaberi','6',1156),(3881,'Zinder','7',1156),(3882,'Abuja Federal Capital Territory','FC',1157),(3883,'Abia','AB',1157),(3884,'Adamawa','AD',1157),(3885,'Akwa Ibom','AK',1157),(3886,'Anambra','AN',1157),(3887,'Bauchi','BA',1157),(3888,'Bayelsa','BY',1157),(3889,'Benue','BE',1157),(3890,'Borno','BO',1157),(3891,'Cross River','CR',1157),(3892,'Delta','DE',1157),(3893,'Ebonyi','EB',1157),(3894,'Edo','ED',1157),(3895,'Ekiti','EK',1157),(3896,'Enugu','EN',1157),(3897,'Gombe','GO',1157),(3898,'Imo','IM',1157),(3899,'Jigawa','JI',1157),(3900,'Kaduna','KD',1157),(3901,'Kano','KN',1157),(3902,'Katsina','KT',1157),(3903,'Kebbi','KE',1157),(3904,'Kogi','KO',1157),(3905,'Kwara','KW',1157),(3906,'Lagos','LA',1157),(3907,'Nassarawa','NA',1157),(3908,'Niger','NI',1157),(3909,'Ogun','OG',1157),(3910,'Ondo','ON',1157),(3911,'Osun','OS',1157),(3912,'Oyo','OY',1157),(3913,'Rivers','RI',1157),(3914,'Sokoto','SO',1157),(3915,'Taraba','TA',1157),(3916,'Yobe','YO',1157),(3917,'Zamfara','ZA',1157),(3918,'Boaco','BO',1155),(3919,'Carazo','CA',1155),(3920,'Chinandega','CI',1155),(3921,'Chontales','CO',1155),(3922,'Esteli','ES',1155),(3923,'Jinotega','JI',1155),(3924,'Leon','LE',1155),(3925,'Madriz','MD',1155),(3926,'Managua','MN',1155),(3927,'Masaya','MS',1155),(3928,'Matagalpa','MT',1155),(3929,'Nueva Segovia','NS',1155),(3930,'Rio San Juan','SJ',1155),(3931,'Rivas','RI',1155),(3932,'Atlantico Norte','AN',1155),(3933,'Atlantico Sur','AS',1155),(3934,'Drente','DR',1152),(3935,'Flevoland','FL',1152),(3936,'Friesland','FR',1152),(3937,'Gelderland','GL',1152),(3938,'Groningen','GR',1152),(3939,'Noord-Brabant','NB',1152),(3940,'Noord-Holland','NH',1152),(3941,'Overijssel','OV',1152),(3942,'Utrecht','UT',1152),(3943,'Zuid-Holland','ZH',1152),(3944,'Zeeland','ZL',1152),(3945,'Akershus','02',1161),(3946,'Aust-Agder','09',1161),(3947,'Buskerud','06',1161),(3948,'Finnmark','20',1161),(3949,'Hedmark','04',1161),(3950,'Hordaland','12',1161),(3951,'Møre og Romsdal','15',1161),(3952,'Nordland','18',1161),(3953,'Nord-Trøndelag','17',1161),(3954,'Oppland','05',1161),(3955,'Oslo','03',1161),(3956,'Rogaland','11',1161),(3957,'Sogn og Fjordane','14',1161),(3958,'Sør-Trøndelag','16',1161),(3959,'Telemark','06',1161),(3960,'Troms','19',1161),(3961,'Vest-Agder','10',1161),(3962,'Vestfold','07',1161),(3963,'Østfold','01',1161),(3964,'Jan Mayen','22',1161),(3965,'Svalbard','21',1161),(3966,'Auckland','AUK',1154),(3967,'Bay of Plenty','BOP',1154),(3968,'Canterbury','CAN',1154),(3969,'Gisborne','GIS',1154),(3970,'Hawkes Bay','HKB',1154),(3971,'Manawatu-Wanganui','MWT',1154),(3972,'Marlborough','MBH',1154),(3973,'Nelson','NSN',1154),(3974,'Northland','NTL',1154),(3975,'Otago','OTA',1154),(3976,'Southland','STL',1154),(3977,'Taranaki','TKI',1154),(3978,'Tasman','TAS',1154),(3979,'Waikato','WKO',1154),(3980,'Wellington','WGN',1154),(3981,'West Coast','WTC',1154),(3982,'Ad Dakhillyah','DA',1162),(3983,'Al Batinah','BA',1162),(3984,'Al Janblyah','JA',1162),(3985,'Al Wusta','WU',1162),(3986,'Ash Sharqlyah','SH',1162),(3987,'Az Zahirah','ZA',1162),(3988,'Masqat','MA',1162),(3989,'Musandam','MU',1162),(3990,'Bocas del Toro','1',1166),(3991,'Cocle','2',1166),(3992,'Chiriqui','4',1166),(3993,'Darien','5',1166),(3994,'Herrera','6',1166),(3995,'Loa Santoa','7',1166),(3996,'Panama','8',1166),(3997,'Veraguas','9',1166),(3998,'Comarca de San Blas','Q',1166),(3999,'El Callao','CAL',1169),(4000,'Ancash','ANC',1169),(4001,'Apurimac','APU',1169),(4002,'Arequipa','ARE',1169),(4003,'Ayacucho','AYA',1169),(4004,'Cajamarca','CAJ',1169),(4005,'Cuzco','CUS',1169),(4006,'Huancavelica','HUV',1169),(4007,'Huanuco','HUC',1169),(4008,'Ica','ICA',1169),(4009,'Junin','JUN',1169),(4010,'La Libertad','LAL',1169),(4011,'Lambayeque','LAM',1169),(4012,'Lima','LIM',1169),(4013,'Loreto','LOR',1169),(4014,'Madre de Dios','MDD',1169),(4015,'Moquegua','MOQ',1169),(4016,'Pasco','PAS',1169),(4017,'Piura','PIU',1169),(4018,'Puno','PUN',1169),(4019,'San Martin','SAM',1169),(4020,'Tacna','TAC',1169),(4021,'Tumbes','TUM',1169),(4022,'Ucayali','UCA',1169),(4023,'National Capital District (Port Moresby)','NCD',1167),(4024,'Chimbu','CPK',1167),(4025,'Eastern Highlands','EHG',1167),(4026,'East New Britain','EBR',1167),(4027,'East Sepik','ESW',1167),(4028,'Enga','EPW',1167),(4029,'Gulf','GPK',1167),(4030,'Madang','MPM',1167),(4031,'Manus','MRL',1167),(4032,'Milne Bay','MBA',1167),(4033,'Morobe','MPL',1167),(4034,'New Ireland','NIK',1167),(4035,'North Solomons','NSA',1167),(4036,'Santaun','SAN',1167),(4037,'Southern Highlands','SHM',1167),(4038,'Western Highlands','WHM',1167),(4039,'West New Britain','WBK',1167),(4040,'Abra','ABR',1170),(4041,'Agusan del Norte','AGN',1170),(4042,'Agusan del Sur','AGS',1170),(4043,'Aklan','AKL',1170),(4044,'Albay','ALB',1170),(4045,'Antique','ANT',1170),(4046,'Apayao','APA',1170),(4047,'Aurora','AUR',1170),(4048,'Basilan','BAS',1170),(4049,'Bataan','BAN',1170),(4050,'Batanes','BTN',1170),(4051,'Batangas','BTG',1170),(4052,'Benguet','BEN',1170),(4053,'Biliran','BIL',1170),(4054,'Bohol','BOH',1170),(4055,'Bukidnon','BUK',1170),(4056,'Bulacan','BUL',1170),(4057,'Cagayan','CAG',1170),(4058,'Camarines Norte','CAN',1170),(4059,'Camarines Sur','CAS',1170),(4060,'Camiguin','CAM',1170),(4061,'Capiz','CAP',1170),(4062,'Catanduanes','CAT',1170),(4063,'Cavite','CAV',1170),(4064,'Cebu','CEB',1170),(4065,'Compostela Valley','COM',1170),(4066,'Davao','DAV',1170),(4067,'Davao del Sur','DAS',1170),(4068,'Davao Oriental','DAO',1170),(4069,'Eastern Samar','EAS',1170),(4070,'Guimaras','GUI',1170),(4071,'Ifugao','IFU',1170),(4072,'Ilocos Norte','ILN',1170),(4073,'Ilocos Sur','ILS',1170),(4074,'Iloilo','ILI',1170),(4075,'Isabela','ISA',1170),(4076,'Kalinga-Apayso','KAL',1170),(4077,'Laguna','LAG',1170),(4078,'Lanao del Norte','LAN',1170),(4079,'Lanao del Sur','LAS',1170),(4080,'La Union','LUN',1170),(4081,'Leyte','LEY',1170),(4082,'Maguindanao','MAG',1170),(4083,'Marinduque','MAD',1170),(4084,'Masbate','MAS',1170),(4085,'Mindoro Occidental','MDC',1170),(4086,'Mindoro Oriental','MDR',1170),(4087,'Misamis Occidental','MSC',1170),(4088,'Misamis Oriental','MSR',1170),(4089,'Mountain Province','MOU',1170),(4090,'Negroe Occidental','NEC',1170),(4091,'Negros Oriental','NER',1170),(4092,'North Cotabato','NCO',1170),(4093,'Northern Samar','NSA',1170),(4094,'Nueva Ecija','NUE',1170),(4095,'Nueva Vizcaya','NUV',1170),(4096,'Palawan','PLW',1170),(4097,'Pampanga','PAM',1170),(4098,'Pangasinan','PAN',1170),(4099,'Quezon','QUE',1170),(4100,'Quirino','QUI',1170),(4101,'Rizal','RIZ',1170),(4102,'Romblon','ROM',1170),(4103,'Sarangani','SAR',1170),(4104,'Siquijor','SIG',1170),(4105,'Sorsogon','SOR',1170),(4106,'South Cotabato','SCO',1170),(4107,'Southern Leyte','SLE',1170),(4108,'Sultan Kudarat','SUK',1170),(4109,'Sulu','SLU',1170),(4110,'Surigao del Norte','SUN',1170),(4111,'Surigao del Sur','SUR',1170),(4112,'Tarlac','TAR',1170),(4113,'Tawi-Tawi','TAW',1170),(4114,'Western Samar','WSA',1170),(4115,'Zambales','ZMB',1170),(4116,'Zamboanga del Norte','ZAN',1170),(4117,'Zamboanga del Sur','ZAS',1170),(4118,'Zamboanga Sibiguey','ZSI',1170),(4119,'Islamabad Federal Capital Area','IS',1163),(4120,'Baluchistan','BA',1163),(4121,'Khyber Pakhtun Khawa','NW',1163),(4122,'Sindh','SD',1163),(4123,'Federally Administered Tribal Areas','TA',1163),(4124,'Azad Kashmir','JK',1163),(4125,'Gilgit-Baltistan','NA',1163),(4126,'Aveiro','01',1173),(4127,'Beja','02',1173),(4128,'Braga','03',1173),(4129,'Braganca','04',1173),(4130,'Castelo Branco','05',1173),(4131,'Colmbra','06',1173),(4132,'Ovora','07',1173),(4133,'Faro','08',1173),(4134,'Guarda','09',1173),(4135,'Leiria','10',1173),(4136,'Lisboa','11',1173),(4137,'Portalegre','12',1173),(4138,'Porto','13',1173),(4139,'Santarem','14',1173),(4140,'Setubal','15',1173),(4141,'Viana do Castelo','16',1173),(4142,'Vila Real','17',1173),(4143,'Viseu','18',1173),(4144,'Regiao Autonoma dos Acores','20',1173),(4145,'Regiao Autonoma da Madeira','30',1173),(4146,'Asuncion','ASU',1168),(4147,'Alto Paraguay','16',1168),(4148,'Alto Parana','10',1168),(4149,'Amambay','13',1168),(4150,'Boqueron','19',1168),(4151,'Caeguazu','5',1168),(4152,'Caazapl','6',1168),(4153,'Canindeyu','14',1168),(4154,'Concepcion','1',1168),(4155,'Cordillera','3',1168),(4156,'Guaira','4',1168),(4157,'Itapua','7',1168),(4158,'Miaiones','8',1168),(4159,'Neembucu','12',1168),(4160,'Paraguari','9',1168),(4161,'Presidente Hayes','15',1168),(4162,'San Pedro','2',1168),(4163,'Ad Dawhah','DA',1175),(4164,'Al Ghuwayriyah','GH',1175),(4165,'Al Jumayliyah','JU',1175),(4166,'Al Khawr','KH',1175),(4167,'Al Wakrah','WA',1175),(4168,'Ar Rayyan','RA',1175),(4169,'Jariyan al Batnah','JB',1175),(4170,'Madinat ash Shamal','MS',1175),(4171,'Umm Salal','US',1175),(4172,'Bucuresti','B',1176),(4173,'Alba','AB',1176),(4174,'Arad','AR',1176),(4175,'Arges','AG',1176),(4176,'Bacau','BC',1176),(4177,'Bihor','BH',1176),(4178,'Bistrita-Nasaud','BN',1176),(4179,'Boto\'ani','BT',1176),(4180,'Bra\'ov','BV',1176),(4181,'Braila','BR',1176),(4182,'Buzau','BZ',1176),(4183,'Caras-Severin','CS',1176),(4184,'Ca la ras\'i','CL',1176),(4185,'Cluj','CJ',1176),(4186,'Constant\'a','CT',1176),(4187,'Covasna','CV',1176),(4188,'Dambovit\'a','DB',1176),(4189,'Dolj','DJ',1176),(4190,'Galat\'i','GL',1176),(4191,'Giurgiu','GR',1176),(4192,'Gorj','GJ',1176),(4193,'Harghita','HR',1176),(4194,'Hunedoara','HD',1176),(4195,'Ialomit\'a','IL',1176),(4196,'Ias\'i','IS',1176),(4197,'Ilfov','IF',1176),(4198,'Maramures','MM',1176),(4199,'Mehedint\'i','MH',1176),(4200,'Mures','MS',1176),(4201,'Neamt','NT',1176),(4202,'Olt','OT',1176),(4203,'Prahova','PH',1176),(4204,'Satu Mare','SM',1176),(4205,'Sa laj','SJ',1176),(4206,'Sibiu','SB',1176),(4207,'Suceava','SV',1176),(4208,'Teleorman','TR',1176),(4209,'Timis','TM',1176),(4210,'Tulcea','TL',1176),(4211,'Vaslui','VS',1176),(4212,'Valcea','VL',1176),(4213,'Vrancea','VN',1176),(4214,'Adygeya, Respublika','AD',1177),(4215,'Altay, Respublika','AL',1177),(4216,'Bashkortostan, Respublika','BA',1177),(4217,'Buryatiya, Respublika','BU',1177),(4218,'Chechenskaya Respublika','CE',1177),(4219,'Chuvashskaya Respublika','CU',1177),(4220,'Dagestan, Respublika','DA',1177),(4221,'Ingushskaya Respublika','IN',1177),(4222,'Kabardino-Balkarskaya','KB',1177),(4223,'Kalmykiya, Respublika','KL',1177),(4224,'Karachayevo-Cherkesskaya Respublika','KC',1177),(4225,'Kareliya, Respublika','KR',1177),(4226,'Khakasiya, Respublika','KK',1177),(4227,'Komi, Respublika','KO',1177),(4228,'Mariy El, Respublika','ME',1177),(4229,'Mordoviya, Respublika','MO',1177),(4230,'Sakha, Respublika [Yakutiya]','SA',1177),(4231,'Severnaya Osetiya, Respublika','SE',1177),(4232,'Tatarstan, Respublika','TA',1177),(4233,'Tyva, Respublika [Tuva]','TY',1177),(4234,'Udmurtskaya Respublika','UD',1177),(4235,'Altayskiy kray','ALT',1177),(4236,'Khabarovskiy kray','KHA',1177),(4237,'Krasnodarskiy kray','KDA',1177),(4238,'Krasnoyarskiy kray','KYA',1177),(4239,'Primorskiy kray','PRI',1177),(4240,'Stavropol\'skiy kray','STA',1177),(4241,'Amurskaya oblast\'','AMU',1177),(4242,'Arkhangel\'skaya oblast\'','ARK',1177),(4243,'Astrakhanskaya oblast\'','AST',1177),(4244,'Belgorodskaya oblast\'','BEL',1177),(4245,'Bryanskaya oblast\'','BRY',1177),(4246,'Chelyabinskaya oblast\'','CHE',1177),(4247,'Zabaykalsky Krai\'','ZSK',1177),(4248,'Irkutskaya oblast\'','IRK',1177),(4249,'Ivanovskaya oblast\'','IVA',1177),(4250,'Kaliningradskaya oblast\'','KGD',1177),(4251,'Kaluzhskaya oblast\'','KLU',1177),(4252,'Kamchatka Krai\'','KAM',1177),(4253,'Kemerovskaya oblast\'','KEM',1177),(4254,'Kirovskaya oblast\'','KIR',1177),(4255,'Kostromskaya oblast\'','KOS',1177),(4256,'Kurganskaya oblast\'','KGN',1177),(4257,'Kurskaya oblast\'','KRS',1177),(4258,'Leningradskaya oblast\'','LEN',1177),(4259,'Lipetskaya oblast\'','LIP',1177),(4260,'Magadanskaya oblast\'','MAG',1177),(4261,'Moskovskaya oblast\'','MOS',1177),(4262,'Murmanskaya oblast\'','MUR',1177),(4263,'Nizhegorodskaya oblast\'','NIZ',1177),(4264,'Novgorodskaya oblast\'','NGR',1177),(4265,'Novosibirskaya oblast\'','NVS',1177),(4266,'Omskaya oblast\'','OMS',1177),(4267,'Orenburgskaya oblast\'','ORE',1177),(4268,'Orlovskaya oblast\'','ORL',1177),(4269,'Penzenskaya oblast\'','PNZ',1177),(4270,'Perm krai\'','PEK',1177),(4271,'Pskovskaya oblast\'','PSK',1177),(4272,'Rostovskaya oblast\'','ROS',1177),(4273,'Ryazanskaya oblast\'','RYA',1177),(4274,'Sakhalinskaya oblast\'','SAK',1177),(4275,'Samarskaya oblast\'','SAM',1177),(4276,'Saratovskaya oblast\'','SAR',1177),(4277,'Smolenskaya oblast\'','SMO',1177),(4278,'Sverdlovskaya oblast\'','SVE',1177),(4279,'Tambovskaya oblast\'','TAM',1177),(4280,'Tomskaya oblast\'','TOM',1177),(4281,'Tul\'skaya oblast\'','TUL',1177),(4282,'Tverskaya oblast\'','TVE',1177),(4283,'Tyumenskaya oblast\'','TYU',1177),(4284,'Ul\'yanovskaya oblast\'','ULY',1177),(4285,'Vladimirskaya oblast\'','VLA',1177),(4286,'Volgogradskaya oblast\'','VGG',1177),(4287,'Vologodskaya oblast\'','VLG',1177),(4288,'Voronezhskaya oblast\'','VOR',1177),(4289,'Yaroslavskaya oblast\'','YAR',1177),(4290,'Moskva','MOW',1177),(4291,'Sankt-Peterburg','SPE',1177),(4292,'Yevreyskaya avtonomnaya oblast\'','YEV',1177),(4294,'Chukotskiy avtonomnyy okrug','CHU',1177),(4296,'Khanty-Mansiyskiy avtonomnyy okrug','KHM',1177),(4299,'Nenetskiy avtonomnyy okrug','NEN',1177),(4302,'Yamalo-Nenetskiy avtonomnyy okrug','YAN',1177),(4303,'Butare','C',1178),(4304,'Byumba','I',1178),(4305,'Cyangugu','E',1178),(4306,'Gikongoro','D',1178),(4307,'Gisenyi','G',1178),(4308,'Gitarama','B',1178),(4309,'Kibungo','J',1178),(4310,'Kibuye','F',1178),(4311,'Kigali-Rural Kigali y\' Icyaro','K',1178),(4312,'Kigali-Ville Kigali Ngari','L',1178),(4313,'Mutara','M',1178),(4314,'Ruhengeri','H',1178),(4315,'Al Bahah','11',1187),(4316,'Al Hudud Ash Shamaliyah','08',1187),(4317,'Al Jawf','12',1187),(4318,'Al Madinah','03',1187),(4319,'Al Qasim','05',1187),(4320,'Ar Riyad','01',1187),(4321,'Asir','14',1187),(4322,'Ha\'il','06',1187),(4323,'Jlzan','09',1187),(4324,'Makkah','02',1187),(4325,'Najran','10',1187),(4326,'Tabuk','07',1187),(4327,'Capital Territory (Honiara)','CT',1194),(4328,'Guadalcanal','GU',1194),(4329,'Isabel','IS',1194),(4330,'Makira','MK',1194),(4331,'Malaita','ML',1194),(4332,'Temotu','TE',1194),(4333,'A\'ali an Nil','23',1200),(4334,'Al Bah al Ahmar','26',1200),(4335,'Al Buhayrat','18',1200),(4336,'Al Jazirah','07',1200),(4337,'Al Khartum','03',1200),(4338,'Al Qadarif','06',1200),(4339,'Al Wahdah','22',1200),(4340,'An Nil','04',1200),(4341,'An Nil al Abyaq','08',1200),(4342,'An Nil al Azraq','24',1200),(4343,'Ash Shamallyah','01',1200),(4344,'Bahr al Jabal','17',1200),(4345,'Gharb al Istiwa\'iyah','16',1200),(4346,'Gharb Ba~r al Ghazal','14',1200),(4347,'Gharb Darfur','12',1200),(4348,'Gharb Kurdufan','10',1200),(4349,'Janub Darfur','11',1200),(4350,'Janub Rurdufan','13',1200),(4351,'Jnqall','20',1200),(4352,'Kassala','05',1200),(4353,'Shamal Batr al Ghazal','15',1200),(4354,'Shamal Darfur','02',1200),(4355,'Shamal Kurdufan','09',1200),(4356,'Sharq al Istiwa\'iyah','19',1200),(4357,'Sinnar','25',1200),(4358,'Warab','21',1200),(4359,'Blekinge län','K',1204),(4360,'Dalarnas län','W',1204),(4361,'Gotlands län','I',1204),(4362,'Gävleborgs län','X',1204),(4363,'Hallands län','N',1204),(4364,'Jämtlands län','Z',1204),(4365,'Jönkopings län','F',1204),(4366,'Kalmar län','H',1204),(4367,'Kronobergs län','G',1204),(4368,'Norrbottens län','BD',1204),(4369,'SkÃ¥ne län','M',1204),(4370,'Stockholms län','AB',1204),(4371,'Södermanlands län','D',1204),(4372,'Uppsala län','C',1204),(4373,'Värmlands län','S',1204),(4374,'Västerbottens län','AC',1204),(4375,'Västernorrlands län','Y',1204),(4376,'Västmanlands län','U',1204),(4377,'Västra Götalands län','Q',1204),(4378,'Örebro län','T',1204),(4379,'Östergötlands län','E',1204),(4380,'Saint Helena','SH',1180),(4381,'Ascension','AC',1180),(4382,'Tristan da Cunha','TA',1180),(4383,'AjdovÅ¡Äina','001',1193),(4384,'Beltinci','002',1193),(4385,'Benedikt','148',1193),(4386,'Bistrica ob Sotli','149',1193),(4387,'Bled','003',1193),(4388,'Bloke','150',1193),(4389,'Bohinj','004',1193),(4390,'Borovnica','005',1193),(4391,'Bovec','006',1193),(4392,'BraslovÄe','151',1193),(4393,'Brda','007',1193),(4394,'Brezovica','008',1193),(4395,'Brežice','009',1193),(4396,'Cankova','152',1193),(4397,'Celje','011',1193),(4398,'Cerklje na Gorenjskem','012',1193),(4399,'Cerknica','013',1193),(4400,'Cerkno','014',1193),(4401,'Cerkvenjak','153',1193),(4402,'ÄŒrenÅ¡ovci','015',1193),(4403,'ÄŒrna na KoroÅ¡kem','016',1193),(4404,'ÄŒrnomelj','017',1193),(4405,'Destrnik','018',1193),(4406,'DivaÄa','019',1193),(4407,'Dobje','154',1193),(4408,'Dobrepolje','020',1193),(4409,'Dobrna','155',1193),(4410,'Dobrova-Polhov Gradec','021',1193),(4411,'Dobrovnik','156',1193),(4412,'Dol pri Ljubljani','022',1193),(4413,'Dolenjske Toplice','157',1193),(4414,'Domžale','023',1193),(4415,'Dornava','024',1193),(4416,'Dravograd','025',1193),(4417,'Duplek','026',1193),(4418,'Gorenja vas-Poljane','027',1193),(4419,'GoriÅ¡nica','028',1193),(4420,'Gornja Radgona','029',1193),(4421,'Gornji Grad','030',1193),(4422,'Gornji Petrovci','031',1193),(4423,'Grad','158',1193),(4424,'Grosuplje','032',1193),(4425,'Hajdina','159',1193),(4426,'HoÄe-Slivnica','160',1193),(4427,'HodoÅ¡','161',1193),(4428,'Horjul','162',1193),(4429,'Hrastnik','034',1193),(4430,'Hrpelje-Kozina','035',1193),(4431,'Idrija','036',1193),(4432,'Ig','037',1193),(4433,'Ilirska Bistrica','038',1193),(4434,'IvanÄna Gorica','039',1193),(4435,'Izola','040',1193),(4436,'Jesenice','041',1193),(4437,'Jezersko','163',1193),(4438,'JurÅ¡inci','042',1193),(4439,'Kamnik','043',1193),(4440,'Kanal','044',1193),(4441,'KidriÄevo','045',1193),(4442,'Kobarid','046',1193),(4443,'Kobilje','047',1193),(4444,'KoÄevje','048',1193),(4445,'Komen','049',1193),(4446,'Komenda','164',1193),(4447,'Koper','050',1193),(4448,'Kostel','165',1193),(4449,'Kozje','051',1193),(4450,'Kranj','052',1193),(4451,'Kranjska Gora','053',1193),(4452,'Križevci','166',1193),(4453,'KrÅ¡ko','054',1193),(4454,'Kungota','055',1193),(4455,'Kuzma','056',1193),(4456,'LaÅ¡ko','057',1193),(4457,'Lenart','058',1193),(4458,'Lendava','059',1193),(4459,'Litija','060',1193),(4460,'Ljubljana','061',1193),(4461,'Ljubno','062',1193),(4462,'Ljutomer','063',1193),(4463,'Logatec','064',1193),(4464,'LoÅ¡ka dolina','065',1193),(4465,'LoÅ¡ki Potok','066',1193),(4466,'Lovrenc na Pohorju','167',1193),(4467,'LuÄe','067',1193),(4468,'Lukovica','068',1193),(4469,'MajÅ¡perk','069',1193),(4470,'Maribor','070',1193),(4471,'Markovci','168',1193),(4472,'Medvode','071',1193),(4473,'MengeÅ¡','072',1193),(4474,'Metlika','073',1193),(4475,'Mežica','074',1193),(4476,'Miklavž na Dravskem polju','169',1193),(4477,'Miren-Kostanjevica','075',1193),(4478,'Mirna PeÄ','170',1193),(4479,'Mislinja','076',1193),(4480,'MoravÄe','077',1193),(4481,'Moravske Toplice','078',1193),(4482,'Mozirje','079',1193),(4483,'Murska Sobota','080',1193),(4484,'Muta','081',1193),(4485,'Naklo','082',1193),(4486,'Nazarje','083',1193),(4487,'Nova Gorica','084',1193),(4488,'Novo mesto','085',1193),(4489,'Sveta Ana','181',1193),(4490,'Sveti Andraž v Slovenskih goricah','182',1193),(4491,'Sveti Jurij','116',1193),(4492,'Å alovci','033',1193),(4493,'Å empeter-Vrtojba','183',1193),(4494,'Å enÄur','117',1193),(4495,'Å entilj','118',1193),(4496,'Å entjernej','119',1193),(4497,'Å entjur','120',1193),(4498,'Å kocjan','121',1193),(4499,'Å kofja Loka','122',1193),(4500,'Å kofljica','123',1193),(4501,'Å marje pri JelÅ¡ah','124',1193),(4502,'Å martno ob Paki','125',1193),(4503,'Å martno pri Litiji','194',1193),(4504,'Å oÅ¡tanj','126',1193),(4505,'Å tore','127',1193),(4506,'Tabor','184',1193),(4507,'TiÅ¡ina','010',1193),(4508,'Tolmin','128',1193),(4509,'Trbovlje','129',1193),(4510,'Trebnje','130',1193),(4511,'Trnovska vas','185',1193),(4512,'TržiÄ','131',1193),(4513,'Trzin','186',1193),(4514,'TurniÅ¡Äe','132',1193),(4515,'Velenje','133',1193),(4516,'Velika Polana','187',1193),(4517,'Velike LaÅ¡Äe','134',1193),(4518,'Veržej','188',1193),(4519,'Videm','135',1193),(4520,'Vipava','136',1193),(4521,'Vitanje','137',1193),(4522,'Vojnik','138',1193),(4523,'Vransko','189',1193),(4524,'Vrhnika','140',1193),(4525,'Vuzenica','141',1193),(4526,'Zagorje ob Savi','142',1193),(4527,'ZavrÄ','143',1193),(4528,'ZreÄe','144',1193),(4529,'Žalec','190',1193),(4530,'Železniki','146',1193),(4531,'Žetale','191',1193),(4532,'Žiri','147',1193),(4533,'Žirovnica','192',1193),(4534,'Žužemberk','193',1193),(4535,'Banskobystrický kraj','BC',1192),(4536,'Bratislavský kraj','BL',1192),(4537,'KoÅ¡ický kraj','KI',1192),(4538,'Nitriansky kraj','NJ',1192),(4539,'PreÅ¡ovský kraj','PV',1192),(4540,'TrenÄiansky kraj','TC',1192),(4541,'Trnavský kraj','TA',1192),(4542,'Žilinský kraj','ZI',1192),(4543,'Western Area (Freetown)','W',1190),(4544,'Dakar','DK',1188),(4545,'Diourbel','DB',1188),(4546,'Fatick','FK',1188),(4547,'Kaolack','KL',1188),(4548,'Kolda','KD',1188),(4549,'Louga','LG',1188),(4550,'Matam','MT',1188),(4551,'Saint-Louis','SL',1188),(4552,'Tambacounda','TC',1188),(4553,'Thies','TH',1188),(4554,'Ziguinchor','ZG',1188),(4555,'Awdal','AW',1195),(4556,'Bakool','BK',1195),(4557,'Banaadir','BN',1195),(4558,'Bay','BY',1195),(4559,'Galguduud','GA',1195),(4560,'Gedo','GE',1195),(4561,'Hiirsan','HI',1195),(4562,'Jubbada Dhexe','JD',1195),(4563,'Jubbada Hoose','JH',1195),(4564,'Mudug','MU',1195),(4565,'Nugaal','NU',1195),(4566,'Saneag','SA',1195),(4567,'Shabeellaha Dhexe','SD',1195),(4568,'Shabeellaha Hoose','SH',1195),(4569,'Sool','SO',1195),(4570,'Togdheer','TO',1195),(4571,'Woqooyi Galbeed','WO',1195),(4572,'Brokopondo','BR',1201),(4573,'Commewijne','CM',1201),(4574,'Coronie','CR',1201),(4575,'Marowijne','MA',1201),(4576,'Nickerie','NI',1201),(4577,'Paramaribo','PM',1201),(4578,'Saramacca','SA',1201),(4579,'Sipaliwini','SI',1201),(4580,'Wanica','WA',1201),(4581,'Principe','P',1207),(4582,'Sao Tome','S',1207),(4583,'Ahuachapan','AH',1066),(4584,'Cabanas','CA',1066),(4585,'Cuscatlan','CU',1066),(4586,'Chalatenango','CH',1066),(4587,'Morazan','MO',1066),(4588,'San Miguel','SM',1066),(4589,'San Salvador','SS',1066),(4590,'Santa Ana','SA',1066),(4591,'San Vicente','SV',1066),(4592,'Sonsonate','SO',1066),(4593,'Usulutan','US',1066),(4594,'Al Hasakah','HA',1206),(4595,'Al Ladhiqiyah','LA',1206),(4596,'Al Qunaytirah','QU',1206),(4597,'Ar Raqqah','RA',1206),(4598,'As Suwayda\'','SU',1206),(4599,'Dar\'a','DR',1206),(4600,'Dayr az Zawr','DY',1206),(4601,'Dimashq','DI',1206),(4602,'Halab','HL',1206),(4603,'Hamah','HM',1206),(4604,'Jim\'','HI',1206),(4605,'Idlib','ID',1206),(4606,'Rif Dimashq','RD',1206),(4607,'Tarts','TA',1206),(4608,'Hhohho','HH',1203),(4609,'Lubombo','LU',1203),(4610,'Manzini','MA',1203),(4611,'Shiselweni','SH',1203),(4612,'Batha','BA',1043),(4613,'Biltine','BI',1043),(4614,'Borkou-Ennedi-Tibesti','BET',1043),(4615,'Chari-Baguirmi','CB',1043),(4616,'Guera','GR',1043),(4617,'Kanem','KA',1043),(4618,'Lac','LC',1043),(4619,'Logone-Occidental','LO',1043),(4620,'Logone-Oriental','LR',1043),(4621,'Mayo-Kebbi','MK',1043),(4622,'Moyen-Chari','MC',1043),(4623,'Ouaddai','OD',1043),(4624,'Salamat','SA',1043),(4625,'Tandjile','TA',1043),(4626,'Kara','K',1214),(4627,'Maritime (Region)','M',1214),(4628,'Savannes','S',1214),(4629,'Krung Thep Maha Nakhon Bangkok','10',1211),(4630,'Phatthaya','S',1211),(4631,'Amnat Charoen','37',1211),(4632,'Ang Thong','15',1211),(4633,'Buri Ram','31',1211),(4634,'Chachoengsao','24',1211),(4635,'Chai Nat','18',1211),(4636,'Chaiyaphum','36',1211),(4637,'Chanthaburi','22',1211),(4638,'Chiang Mai','50',1211),(4639,'Chiang Rai','57',1211),(4640,'Chon Buri','20',1211),(4641,'Chumphon','86',1211),(4642,'Kalasin','46',1211),(4643,'Kamphasng Phet','62',1211),(4644,'Kanchanaburi','71',1211),(4645,'Khon Kaen','40',1211),(4646,'Krabi','81',1211),(4647,'Lampang','52',1211),(4648,'Lamphun','51',1211),(4649,'Loei','42',1211),(4650,'Lop Buri','16',1211),(4651,'Mae Hong Son','58',1211),(4652,'Maha Sarakham','44',1211),(4653,'Mukdahan','49',1211),(4654,'Nakhon Nayok','26',1211),(4655,'Nakhon Pathom','73',1211),(4656,'Nakhon Phanom','48',1211),(4657,'Nakhon Ratchasima','30',1211),(4658,'Nakhon Sawan','60',1211),(4659,'Nakhon Si Thammarat','80',1211),(4660,'Nan','55',1211),(4661,'Narathiwat','96',1211),(4662,'Nong Bua Lam Phu','39',1211),(4663,'Nong Khai','43',1211),(4664,'Nonthaburi','12',1211),(4665,'Pathum Thani','13',1211),(4666,'Pattani','94',1211),(4667,'Phangnga','82',1211),(4668,'Phatthalung','93',1211),(4669,'Phayao','56',1211),(4670,'Phetchabun','67',1211),(4671,'Phetchaburi','76',1211),(4672,'Phichit','66',1211),(4673,'Phitsanulok','65',1211),(4674,'Phrae','54',1211),(4675,'Phra Nakhon Si Ayutthaya','14',1211),(4676,'Phuket','83',1211),(4677,'Prachin Buri','25',1211),(4678,'Prachuap Khiri Khan','77',1211),(4679,'Ranong','85',1211),(4680,'Ratchaburi','70',1211),(4681,'Rayong','21',1211),(4682,'Roi Et','45',1211),(4683,'Sa Kaeo','27',1211),(4684,'Sakon Nakhon','47',1211),(4685,'Samut Prakan','11',1211),(4686,'Samut Sakhon','74',1211),(4687,'Samut Songkhram','75',1211),(4688,'Saraburi','19',1211),(4689,'Satun','91',1211),(4690,'Sing Buri','17',1211),(4691,'Si Sa Ket','33',1211),(4692,'Songkhla','90',1211),(4693,'Sukhothai','64',1211),(4694,'Suphan Buri','72',1211),(4695,'Surat Thani','84',1211),(4696,'Surin','32',1211),(4697,'Tak','63',1211),(4698,'Trang','92',1211),(4699,'Trat','23',1211),(4700,'Ubon Ratchathani','34',1211),(4701,'Udon Thani','41',1211),(4702,'Uthai Thani','61',1211),(4703,'Uttaradit','53',1211),(4704,'Yala','95',1211),(4705,'Yasothon','35',1211),(4706,'Sughd','SU',1209),(4707,'Khatlon','KT',1209),(4708,'Gorno-Badakhshan','GB',1209),(4709,'Ahal','A',1220),(4710,'Balkan','B',1220),(4711,'Dasoguz','D',1220),(4712,'Lebap','L',1220),(4713,'Mary','M',1220),(4714,'Béja','31',1218),(4715,'Ben Arous','13',1218),(4716,'Bizerte','23',1218),(4717,'Gabès','81',1218),(4718,'Gafsa','71',1218),(4719,'Jendouba','32',1218),(4720,'Kairouan','41',1218),(4721,'Rasserine','42',1218),(4722,'Kebili','73',1218),(4723,'L\'Ariana','12',1218),(4724,'Le Ref','33',1218),(4725,'Mahdia','53',1218),(4726,'La Manouba','14',1218),(4727,'Medenine','82',1218),(4728,'Moneatir','52',1218),(4729,'Naboul','21',1218),(4730,'Sfax','61',1218),(4731,'Sidi Bouxid','43',1218),(4732,'Siliana','34',1218),(4733,'Sousse','51',1218),(4734,'Tataouine','83',1218),(4735,'Tozeur','72',1218),(4736,'Tunis','11',1218),(4737,'Zaghouan','22',1218),(4738,'Adana','01',1219),(4739,'Ad yaman','02',1219),(4740,'Afyon','03',1219),(4741,'Ag r','04',1219),(4742,'Aksaray','68',1219),(4743,'Amasya','05',1219),(4744,'Ankara','06',1219),(4745,'Antalya','07',1219),(4746,'Ardahan','75',1219),(4747,'Artvin','08',1219),(4748,'Aydin','09',1219),(4749,'Bal kesir','10',1219),(4750,'Bartin','74',1219),(4751,'Batman','72',1219),(4752,'Bayburt','69',1219),(4753,'Bilecik','11',1219),(4754,'Bingol','12',1219),(4755,'Bitlis','13',1219),(4756,'Bolu','14',1219),(4757,'Burdur','15',1219),(4758,'Bursa','16',1219),(4759,'Canakkale','17',1219),(4760,'Cankir','18',1219),(4761,'Corum','19',1219),(4762,'Denizli','20',1219),(4763,'Diyarbakir','21',1219),(4764,'Duzce','81',1219),(4765,'Edirne','22',1219),(4766,'Elazig','23',1219),(4767,'Erzincan','24',1219),(4768,'Erzurum','25',1219),(4769,'Eskis\'ehir','26',1219),(4770,'Gaziantep','27',1219),(4771,'Giresun','28',1219),(4772,'Gms\'hane','29',1219),(4773,'Hakkari','30',1219),(4774,'Hatay','31',1219),(4775,'Igidir','76',1219),(4776,'Isparta','32',1219),(4777,'Icel','33',1219),(4778,'Istanbul','34',1219),(4779,'Izmir','35',1219),(4780,'Kahramanmaras','46',1219),(4781,'Karabk','78',1219),(4782,'Karaman','70',1219),(4783,'Kars','36',1219),(4784,'Kastamonu','37',1219),(4785,'Kayseri','38',1219),(4786,'Kirikkale','71',1219),(4787,'Kirklareli','39',1219),(4788,'Kirs\'ehir','40',1219),(4789,'Kilis','79',1219),(4790,'Kocaeli','41',1219),(4791,'Konya','42',1219),(4792,'Ktahya','43',1219),(4793,'Malatya','44',1219),(4794,'Manisa','45',1219),(4795,'Mardin','47',1219),(4796,'Mugila','48',1219),(4797,'Mus','49',1219),(4798,'Nevs\'ehir','50',1219),(4799,'Nigide','51',1219),(4800,'Ordu','52',1219),(4801,'Osmaniye','80',1219),(4802,'Rize','53',1219),(4803,'Sakarya','54',1219),(4804,'Samsun','55',1219),(4805,'Siirt','56',1219),(4806,'Sinop','57',1219),(4807,'Sivas','58',1219),(4808,'S\'anliurfa','63',1219),(4809,'S\'rnak','73',1219),(4810,'Tekirdag','59',1219),(4811,'Tokat','60',1219),(4812,'Trabzon','61',1219),(4813,'Tunceli','62',1219),(4814,'Us\'ak','64',1219),(4815,'Van','65',1219),(4816,'Yalova','77',1219),(4817,'Yozgat','66',1219),(4818,'Zonguldak','67',1219),(4819,'Couva-Tabaquite-Talparo','CTT',1217),(4820,'Diego Martin','DMN',1217),(4821,'Eastern Tobago','ETO',1217),(4822,'Penal-Debe','PED',1217),(4823,'Princes Town','PRT',1217),(4824,'Rio Claro-Mayaro','RCM',1217),(4825,'Sangre Grande','SGE',1217),(4826,'San Juan-Laventille','SJL',1217),(4827,'Siparia','SIP',1217),(4828,'Tunapuna-Piarco','TUP',1217),(4829,'Western Tobago','WTO',1217),(4830,'Arima','ARI',1217),(4831,'Chaguanas','CHA',1217),(4832,'Point Fortin','PTF',1217),(4833,'Port of Spain','POS',1217),(4834,'San Fernando','SFO',1217),(4835,'Aileu','AL',1063),(4836,'Ainaro','AN',1063),(4837,'Bacucau','BA',1063),(4838,'Bobonaro','BO',1063),(4839,'Cova Lima','CO',1063),(4840,'Dili','DI',1063),(4841,'Ermera','ER',1063),(4842,'Laulem','LA',1063),(4843,'Liquica','LI',1063),(4844,'Manatuto','MT',1063),(4845,'Manafahi','MF',1063),(4846,'Oecussi','OE',1063),(4847,'Viqueque','VI',1063),(4848,'Changhua County','CHA',1208),(4849,'Chiayi County','CYQ',1208),(4850,'Hsinchu County','HSQ',1208),(4851,'Hualien County','HUA',1208),(4852,'Ilan County','ILA',1208),(4853,'Kaohsiung County','KHQ',1208),(4854,'Miaoli County','MIA',1208),(4855,'Nantou County','NAN',1208),(4856,'Penghu County','PEN',1208),(4857,'Pingtung County','PIF',1208),(4858,'Taichung County','TXQ',1208),(4859,'Tainan County','TNQ',1208),(4860,'Taipei County','TPQ',1208),(4861,'Taitung County','TTT',1208),(4862,'Taoyuan County','TAO',1208),(4863,'Yunlin Conuty','YUN',1208),(4864,'Keelung City','KEE',1208),(4865,'Arusha','01',1210),(4866,'Dar-es-Salaam','02',1210),(4867,'Dodoma','03',1210),(4868,'Iringa','04',1210),(4869,'Kagera','05',1210),(4870,'Kaskazini Pemba','06',1210),(4871,'Kaskazini Unguja','07',1210),(4872,'Xigoma','08',1210),(4873,'Kilimanjaro','09',1210),(4874,'Rusini Pemba','10',1210),(4875,'Kusini Unguja','11',1210),(4876,'Lindi','12',1210),(4877,'Manyara','26',1210),(4878,'Mara','13',1210),(4879,'Mbeya','14',1210),(4880,'Mjini Magharibi','15',1210),(4881,'Morogoro','16',1210),(4882,'Mtwara','17',1210),(4883,'Pwani','19',1210),(4884,'Rukwa','20',1210),(4885,'Ruvuma','21',1210),(4886,'Shinyanga','22',1210),(4887,'Singida','23',1210),(4888,'Tabora','24',1210),(4889,'Tanga','25',1210),(4890,'Cherkas\'ka Oblast\'','71',1224),(4891,'Chernihivs\'ka Oblast\'','74',1224),(4892,'Chernivets\'ka Oblast\'','77',1224),(4893,'Dnipropetrovs\'ka Oblast\'','12',1224),(4894,'Donets\'ka Oblast\'','14',1224),(4895,'Ivano-Frankivs\'ka Oblast\'','26',1224),(4896,'Kharkivs\'ka Oblast\'','63',1224),(4897,'Khersons\'ka Oblast\'','65',1224),(4898,'Khmel\'nyts\'ka Oblast\'','68',1224),(4899,'Kirovohrads\'ka Oblast\'','35',1224),(4900,'Kyivs\'ka Oblast\'','32',1224),(4901,'Luhans\'ka Oblast\'','09',1224),(4902,'L\'vivs\'ka Oblast\'','46',1224),(4903,'Mykolaivs\'ka Oblast\'','48',1224),(4904,'Odes \'ka Oblast\'','51',1224),(4905,'Poltavs\'ka Oblast\'','53',1224),(4906,'Rivnens\'ka Oblast\'','56',1224),(4907,'Sums \'ka Oblast\'','59',1224),(4908,'Ternopil\'s\'ka Oblast\'','61',1224),(4909,'Vinnyts\'ka Oblast\'','05',1224),(4910,'Volyos\'ka Oblast\'','07',1224),(4911,'Zakarpats\'ka Oblast\'','21',1224),(4912,'Zaporiz\'ka Oblast\'','23',1224),(4913,'Zhytomyrs\'ka Oblast\'','18',1224),(4914,'Respublika Krym','43',1224),(4915,'Kyiv','30',1224),(4916,'Sevastopol','40',1224),(4917,'Adjumani','301',1223),(4918,'Apac','302',1223),(4919,'Arua','303',1223),(4920,'Bugiri','201',1223),(4921,'Bundibugyo','401',1223),(4922,'Bushenyi','402',1223),(4923,'Busia','202',1223),(4924,'Gulu','304',1223),(4925,'Hoima','403',1223),(4926,'Iganga','203',1223),(4927,'Jinja','204',1223),(4928,'Kabale','404',1223),(4929,'Kabarole','405',1223),(4930,'Kaberamaido','213',1223),(4931,'Kalangala','101',1223),(4932,'Kampala','102',1223),(4933,'Kamuli','205',1223),(4934,'Kamwenge','413',1223),(4935,'Kanungu','414',1223),(4936,'Kapchorwa','206',1223),(4937,'Kasese','406',1223),(4938,'Katakwi','207',1223),(4939,'Kayunga','112',1223),(4940,'Kibaale','407',1223),(4941,'Kiboga','103',1223),(4942,'Kisoro','408',1223),(4943,'Kitgum','305',1223),(4944,'Kotido','306',1223),(4945,'Kumi','208',1223),(4946,'Kyenjojo','415',1223),(4947,'Lira','307',1223),(4948,'Luwero','104',1223),(4949,'Masaka','105',1223),(4950,'Masindi','409',1223),(4951,'Mayuge','214',1223),(4952,'Mbale','209',1223),(4953,'Mbarara','410',1223),(4954,'Moroto','308',1223),(4955,'Moyo','309',1223),(4956,'Mpigi','106',1223),(4957,'Mubende','107',1223),(4958,'Mukono','108',1223),(4959,'Nakapiripirit','311',1223),(4960,'Nakasongola','109',1223),(4961,'Nebbi','310',1223),(4962,'Ntungamo','411',1223),(4963,'Pader','312',1223),(4964,'Pallisa','210',1223),(4965,'Rakai','110',1223),(4966,'Rukungiri','412',1223),(4967,'Sembabule','111',1223),(4968,'Sironko','215',1223),(4969,'Soroti','211',1223),(4970,'Tororo','212',1223),(4971,'Wakiso','113',1223),(4972,'Yumbe','313',1223),(4973,'Baker Island','81',1227),(4974,'Howland Island','84',1227),(4975,'Jarvis Island','86',1227),(4976,'Johnston Atoll','67',1227),(4977,'Kingman Reef','89',1227),(4978,'Midway Islands','71',1227),(4979,'Navassa Island','76',1227),(4980,'Palmyra Atoll','95',1227),(4981,'Wake Island','79',1227),(4982,'Artigsa','AR',1229),(4983,'Canelones','CA',1229),(4984,'Cerro Largo','CL',1229),(4985,'Colonia','CO',1229),(4986,'Durazno','DU',1229),(4987,'Flores','FS',1229),(4988,'Lavalleja','LA',1229),(4989,'Maldonado','MA',1229),(4990,'Montevideo','MO',1229),(4991,'Paysandu','PA',1229),(4992,'Rivera','RV',1229),(4993,'Rocha','RO',1229),(4994,'Salto','SA',1229),(4995,'Soriano','SO',1229),(4996,'Tacuarembo','TA',1229),(4997,'Treinta y Tres','TT',1229),(4998,'Toshkent (city)','TK',1230),(4999,'Qoraqalpogiston Respublikasi','QR',1230),(5000,'Andijon','AN',1230),(5001,'Buxoro','BU',1230),(5002,'Farg\'ona','FA',1230),(5003,'Jizzax','JI',1230),(5004,'Khorazm','KH',1230),(5005,'Namangan','NG',1230),(5006,'Navoiy','NW',1230),(5007,'Qashqadaryo','QA',1230),(5008,'Samarqand','SA',1230),(5009,'Sirdaryo','SI',1230),(5010,'Surxondaryo','SU',1230),(5011,'Toshkent','TO',1230),(5012,'Xorazm','XO',1230),(5013,'Distrito Federal','A',1232),(5014,'Anzoategui','B',1232),(5015,'Apure','C',1232),(5016,'Aragua','D',1232),(5017,'Barinas','E',1232),(5018,'Carabobo','G',1232),(5019,'Cojedes','H',1232),(5020,'Falcon','I',1232),(5021,'Guarico','J',1232),(5022,'Lara','K',1232),(5023,'Merida','L',1232),(5024,'Miranda','M',1232),(5025,'Monagas','N',1232),(5026,'Nueva Esparta','O',1232),(5027,'Portuguesa','P',1232),(5028,'Tachira','S',1232),(5029,'Trujillo','T',1232),(5030,'Vargas','X',1232),(5031,'Yaracuy','U',1232),(5032,'Zulia','V',1232),(5033,'Delta Amacuro','Y',1232),(5034,'Dependencias Federales','W',1232),(5035,'An Giang','44',1233),(5036,'Ba Ria - Vung Tau','43',1233),(5037,'Bac Can','53',1233),(5038,'Bac Giang','54',1233),(5039,'Bac Lieu','55',1233),(5040,'Bac Ninh','56',1233),(5041,'Ben Tre','50',1233),(5042,'Binh Dinh','31',1233),(5043,'Binh Duong','57',1233),(5044,'Binh Phuoc','58',1233),(5045,'Binh Thuan','40',1233),(5046,'Ca Mau','59',1233),(5047,'Can Tho','48',1233),(5048,'Cao Bang','04',1233),(5049,'Da Nang, thanh pho','60',1233),(5050,'Dong Nai','39',1233),(5051,'Dong Thap','45',1233),(5052,'Gia Lai','30',1233),(5053,'Ha Giang','03',1233),(5054,'Ha Nam','63',1233),(5055,'Ha Noi, thu do','64',1233),(5056,'Ha Tay','15',1233),(5057,'Ha Tinh','23',1233),(5058,'Hai Duong','61',1233),(5059,'Hai Phong, thanh pho','62',1233),(5060,'Hoa Binh','14',1233),(5061,'Ho Chi Minh, thanh pho [Sai Gon]','65',1233),(5062,'Hung Yen','66',1233),(5063,'Khanh Hoa','34',1233),(5064,'Kien Giang','47',1233),(5065,'Kon Tum','28',1233),(5066,'Lai Chau','01',1233),(5067,'Lam Dong','35',1233),(5068,'Lang Son','09',1233),(5069,'Lao Cai','02',1233),(5070,'Long An','41',1233),(5071,'Nam Dinh','67',1233),(5072,'Nghe An','22',1233),(5073,'Ninh Binh','18',1233),(5074,'Ninh Thuan','36',1233),(5075,'Phu Tho','68',1233),(5076,'Phu Yen','32',1233),(5077,'Quang Binh','24',1233),(5078,'Quang Nam','27',1233),(5079,'Quang Ngai','29',1233),(5080,'Quang Ninh','13',1233),(5081,'Quang Tri','25',1233),(5082,'Soc Trang','52',1233),(5083,'Son La','05',1233),(5084,'Tay Ninh','37',1233),(5085,'Thai Binh','20',1233),(5086,'Thai Nguyen','69',1233),(5087,'Thanh Hoa','21',1233),(5088,'Thua Thien-Hue','26',1233),(5089,'Tien Giang','46',1233),(5090,'Tra Vinh','51',1233),(5091,'Tuyen Quang','07',1233),(5092,'Vinh Long','49',1233),(5093,'Vinh Phuc','70',1233),(5094,'Yen Bai','06',1233),(5095,'Malampa','MAP',1231),(5096,'Penama','PAM',1231),(5097,'Sanma','SAM',1231),(5098,'Shefa','SEE',1231),(5099,'Tafea','TAE',1231),(5100,'Torba','TOB',1231),(5101,'A\'ana','AA',1185),(5102,'Aiga-i-le-Tai','AL',1185),(5103,'Atua','AT',1185),(5104,'Fa\'aaaleleaga','FA',1185),(5105,'Gaga\'emauga','GE',1185),(5106,'Gagaifomauga','GI',1185),(5107,'Palauli','PA',1185),(5108,'Satupa\'itea','SA',1185),(5109,'Tuamasaga','TU',1185),(5110,'Va\'a-o-Fonoti','VF',1185),(5111,'Vaisigano','VS',1185),(5112,'Crna Gora','CG',1243),(5113,'Srbija','SR',1242),(5114,'Kosovo-Metohija','KM',1242),(5115,'Vojvodina','VO',1242),(5116,'Abyan','AB',1237),(5117,'Adan','AD',1237),(5118,'Ad Dali','DA',1237),(5119,'Al Bayda\'','BA',1237),(5120,'Al Hudaydah','MU',1237),(5121,'Al Mahrah','MR',1237),(5122,'Al Mahwit','MW',1237),(5123,'Amran','AM',1237),(5124,'Dhamar','DH',1237),(5125,'Hadramawt','HD',1237),(5126,'Hajjah','HJ',1237),(5127,'Ibb','IB',1237),(5128,'Lahij','LA',1237),(5129,'Ma\'rib','MA',1237),(5130,'Sa\'dah','SD',1237),(5131,'San\'a\'','SN',1237),(5132,'Shabwah','SH',1237),(5133,'Ta\'izz','TA',1237),(5134,'Eastern Cape','EC',1196),(5135,'Free State','FS',1196),(5136,'Gauteng','GT',1196),(5137,'Kwazulu-Natal','NL',1196),(5138,'Mpumalanga','MP',1196),(5139,'Northern Cape','NC',1196),(5140,'Limpopo','NP',1196),(5141,'Western Cape','WC',1196),(5142,'Copperbelt','08',1239),(5143,'Luapula','04',1239),(5144,'Lusaka','09',1239),(5145,'North-Western','06',1239),(5146,'Bulawayo','BU',1240),(5147,'Harare','HA',1240),(5148,'Manicaland','MA',1240),(5149,'Mashonaland Central','MC',1240),(5150,'Mashonaland East','ME',1240),(5151,'Mashonaland West','MW',1240),(5152,'Masvingo','MV',1240),(5153,'Matabeleland North','MN',1240),(5154,'Matabeleland South','MS',1240),(5155,'Midlands','MI',1240),(5156,'South Karelia','SK',1075),(5157,'South Ostrobothnia','SO',1075),(5158,'Etelä-Savo','ES',1075),(5159,'Häme','HH',1075),(5160,'Itä-Uusimaa','IU',1075),(5161,'Kainuu','KA',1075),(5162,'Central Ostrobothnia','CO',1075),(5163,'Central Finland','CF',1075),(5164,'Kymenlaakso','KY',1075),(5165,'Lapland','LA',1075),(5166,'Tampere Region','TR',1075),(5167,'Ostrobothnia','OB',1075),(5168,'North Karelia','NK',1075),(5169,'Northern Ostrobothnia','NO',1075),(5170,'Northern Savo','NS',1075),(5171,'Päijät-Häme','PH',1075),(5172,'Satakunta','SK',1075),(5173,'Uusimaa','UM',1075),(5174,'South-West Finland','SW',1075),(5175,'Ã…land','AL',1075),(5176,'Limburg','LI',1152),(5177,'Central and Western','CW',1098),(5178,'Eastern','EA',1098),(5179,'Southern','SO',1098),(5180,'Wan Chai','WC',1098),(5181,'Kowloon City','KC',1098),(5182,'Kwun Tong','KU',1098),(5183,'Sham Shui Po','SS',1098),(5184,'Wong Tai Sin','WT',1098),(5185,'Yau Tsim Mong','YT',1098),(5186,'Islands','IS',1098),(5187,'Kwai Tsing','KI',1098),(5188,'North','NO',1098),(5189,'Sai Kung','SK',1098),(5190,'Sha Tin','ST',1098),(5191,'Tai Po','TP',1098),(5192,'Tsuen Wan','TW',1098),(5193,'Tuen Mun','TM',1098),(5194,'Yuen Long','YL',1098),(5195,'Manchester','MR',1108),(5196,'Al ManÄmah (Al ‘Āşimah)','13',1016),(5197,'Al JanÅ«bÄ«yah','14',1016),(5199,'Al Wusţá','16',1016),(5200,'Ash ShamÄlÄ«yah','17',1016),(5201,'Jenin','_A',1165),(5202,'Tubas','_B',1165),(5203,'Tulkarm','_C',1165),(5204,'Nablus','_D',1165),(5205,'Qalqilya','_E',1165),(5206,'Salfit','_F',1165),(5207,'Ramallah and Al-Bireh','_G',1165),(5208,'Jericho','_H',1165),(5209,'Jerusalem','_I',1165),(5210,'Bethlehem','_J',1165),(5211,'Hebron','_K',1165),(5212,'North Gaza','_L',1165),(5213,'Gaza','_M',1165),(5214,'Deir el-Balah','_N',1165),(5215,'Khan Yunis','_O',1165),(5216,'Rafah','_P',1165),(5217,'Brussels','BRU',1020),(5218,'Distrito Federal','DIF',1140),(5219,'Taichung City','TXG',1208),(5220,'Kaohsiung City','KHH',1208),(5221,'Taipei City','TPE',1208),(5222,'Chiayi City','CYI',1208),(5223,'Hsinchu City','HSZ',1208),(5224,'Tainan City','TNN',1208),(9000,'North West','NW',1196),(9986,'Tyne and Wear','TWR',1226),(9988,'Greater Manchester','GTM',1226),(9989,'Co Tyrone','TYR',1226),(9990,'West Yorkshire','WYK',1226),(9991,'South Yorkshire','SYK',1226),(9992,'Merseyside','MSY',1226),(9993,'Berkshire','BRK',1226),(9994,'West Midlands','WMD',1226),(9998,'West Glamorgan','WGM',1226),(9999,'London','LON',1226),(10000,'Carbonia-Iglesias','CI',1107),(10001,'Olbia-Tempio','OT',1107),(10002,'Medio Campidano','VS',1107),(10003,'Ogliastra','OG',1107),(10009,'Jura','39',1076),(10010,'Barletta-Andria-Trani','Bar',1107),(10011,'Fermo','Fer',1107),(10012,'Monza e Brianza','Mon',1107),(10013,'Clwyd','CWD',1226),(10014,'Dyfed','DFD',1226),(10015,'South Glamorgan','SGM',1226),(10016,'Artibonite','AR',1094),(10017,'Centre','CE',1094),(10018,'Nippes','NI',1094),(10019,'Nord','ND',1094),(10020,'La Rioja','F',1010),(10021,'Andorra la Vella','07',1005),(10022,'Canillo','02',1005),(10023,'Encamp','03',1005),(10024,'Escaldes-Engordany','08',1005),(10025,'La Massana','04',1005),(10026,'Ordino','05',1005),(10027,'Sant Julia de Loria','06',1005),(10028,'Abaco Islands','AB',1212),(10029,'Andros Island','AN',1212),(10030,'Berry Islands','BR',1212),(10031,'Eleuthera','EL',1212),(10032,'Grand Bahama','GB',1212),(10033,'Rum Cay','RC',1212),(10034,'San Salvador Island','SS',1212),(10035,'Kongo central','01',1050),(10036,'Kwango','02',1050),(10037,'Kwilu','03',1050),(10038,'Mai-Ndombe','04',1050),(10039,'Kasai','05',1050),(10040,'Lulua','06',1050),(10041,'Lomami','07',1050),(10042,'Sankuru','08',1050),(10043,'Ituri','09',1050),(10044,'Haut-Uele','10',1050),(10045,'Tshopo','11',1050),(10046,'Bas-Uele','12',1050),(10047,'Nord-Ubangi','13',1050),(10048,'Mongala','14',1050),(10049,'Sud-Ubangi','15',1050),(10050,'Tshuapa','16',1050),(10051,'Haut-Lomami','17',1050),(10052,'Lualaba','18',1050),(10053,'Haut-Katanga','19',1050),(10054,'Tanganyika','20',1050),(10055,'Toledo','TO',1198),(10056,'Córdoba','CO',1198),(10057,'Metropolitan Manila','MNL',1170),(10058,'La Paz','LP',1097),(10059,'Yinchuan','YN',1045),(10060,'Shizuishan','SZ',1045),(10061,'Wuzhong','WZ',1045),(10062,'Guyuan','GY',1045),(10063,'Zhongwei','ZW',1045),(10064,'Luxembourg','L',1126),(10065,'Aizkraukles novads','002',1119),(10066,'Jaunjelgavas novads','038',1119),(10067,'Pļaviņu novads','072',1119),(10068,'Kokneses novads','046',1119),(10069,'Neretas novads','065',1119),(10070,'SkrÄ«veru novads','092',1119),(10071,'AlÅ«ksnes novads','007',1119),(10072,'Apes novads','009',1119),(10073,'Balvu novads','015',1119),(10074,'Viļakas novads','108',1119),(10075,'Baltinavas novads','014',1119),(10076,'RugÄju novads','082',1119),(10077,'Bauskas novads','016',1119),(10078,'Iecavas novads','034',1119),(10079,'RundÄles novads','083',1119),(10080,'Vecumnieku novads','105',1119),(10081,'CÄ“su novads','022',1119),(10082,'LÄ«gatnes novads','055',1119),(10083,'Amatas novads','008',1119),(10084,'Jaunpiebalgas novads','039',1119),(10085,'Priekuļu novads','075',1119),(10086,'PÄrgaujas novads','070',1119),(10087,'Raunas novads','076',1119),(10088,'Vecpiebalgas novads','104',1119),(10089,'Daugavpils novads','025',1119),(10090,'IlÅ«kstes novads','036',1119),(10091,'Dobeles novads','026',1119),(10092,'Auces novads','010',1119),(10093,'TÄ“rvetes novads','098',1119),(10094,'Gulbenes novads','033',1119),(10095,'Jelgavas novads','041',1119),(10096,'Ozolnieku novads','069',1119),(10097,'JÄ“kabpils novads','042',1119),(10098,'AknÄ«stes novads','004',1119),(10099,'ViesÄ«tes novads','107',1119),(10100,'Krustpils novads','049',1119),(10101,'Salas novads','085',1119),(10102,'KrÄslavas novads','047',1119),(10103,'Dagdas novads','024',1119),(10104,'Aglonas novads','001',1119),(10105,'KuldÄ«gas novads','050',1119),(10106,'Skrundas novads','093',1119),(10107,'Alsungas novads','006',1119),(10108,'Aizputes novads','003',1119),(10109,'Durbes novads','028',1119),(10110,'Grobiņas novads','032',1119),(10111,'PÄvilostas novads','071',1119),(10112,'Priekules novads','074',1119),(10113,'NÄ«cas novads','066',1119),(10114,'Rucavas novads','081',1119),(10115,'Vaiņodes novads','100',1119),(10116,'Limbažu novads','054',1119),(10117,'Alojas novads','005',1119),(10118,'SalacgrÄ«vas novads','086',1119),(10119,'Ludzas novads','058',1119),(10120,'KÄrsavas novads','044',1119),(10121,'Zilupes novads','110',1119),(10122,'Ciblas novads','023',1119),(10123,'Madonas novads','059',1119),(10124,'Cesvaines novads','021',1119),(10125,'LubÄnas novads','057',1119),(10126,'VarakļÄnu novads','102',1119),(10127,'Ä’rgļu novads','030',1119),(10128,'Ogres novads','067',1119),(10129,'IkÅ¡Ä·iles novads','035',1119),(10130,'Ķeguma novads','051',1119),(10131,'LielvÄrdes novads','053',1119),(10132,'Preiļu novads','073',1119),(10133,'LÄ«vÄnu novads','056',1119),(10134,'Riebiņu novads','078',1119),(10135,'VÄrkavas novads','103',1119),(10136,'RÄ“zeknes novads','077',1119),(10137,'ViļÄnu novads','109',1119),(10138,'Baldones novads','013',1119),(10139,'Ķekavas novads','052',1119),(10140,'Olaines novads','068',1119),(10141,'Salaspils novads','087',1119),(10142,'Saulkrastu novads','089',1119),(10143,'Siguldas novads','091',1119),(10144,'InÄukalna novads','037',1119),(10145,'Ä€dažu novads','011',1119),(10146,'BabÄ«tes novads','012',1119),(10147,'Carnikavas novads','020',1119),(10148,'Garkalnes novads','031',1119),(10149,'Krimuldas novads','048',1119),(10150,'MÄlpils novads','061',1119),(10151,'MÄrupes novads','062',1119),(10152,'Ropažu novads','080',1119),(10153,'SÄ“jas novads','090',1119),(10154,'Stopiņu novads','095',1119),(10155,'Saldus novads','088',1119),(10156,'BrocÄ“nu novads','018',1119),(10157,'Talsu novads','097',1119),(10158,'Dundagas novads','027',1119),(10159,'MÄ“rsraga novads','063',1119),(10160,'Rojas novads','079',1119),(10161,'Tukuma novads','099',1119),(10162,'Kandavas novads','043',1119),(10163,'Engures novads','029',1119),(10164,'Jaunpils novads','040',1119),(10165,'Valkas novads','101',1119),(10166,'Smiltenes novads','094',1119),(10167,'StrenÄu novads','096',1119),(10168,'KocÄ“nu novads','045',1119),(10169,'Mazsalacas novads','060',1119),(10170,'RÅ«jienas novads','084',1119),(10171,'BeverÄ«nas novads','017',1119),(10172,'Burtnieku novads','019',1119),(10173,'NaukÅ¡Ä“nu novads','064',1119),(10174,'Ventspils novads','106',1119),(10175,'JÄ“kabpils','JKB',1119),(10176,'Valmiera','VMR',1119),(10177,'Florida','FL',1229),(10178,'Rio Negro','RN',1229),(10179,'San Jose','SJ',1229),(10180,'Plateau','PL',1157),(10181,'Pieria','61',1085),(10182,'Los Rios','LR',1044),(10183,'Arica y Parinacota','AP',1044),(10184,'Amazonas','AMA',1169),(10185,'Kalimantan Tengah','KT',1102),(10186,'Sulawesi Barat','SR',1102),(10187,'Kalimantan Utara','KU',1102),(10188,'Ankaran','86',1193),(10189,'ApaÄe','87',1193),(10190,'Cirkulane','88',1193),(10191,'Gorje','89',1193),(10192,'Kostanjevica na Krki','90',1193),(10193,'Log-Dragomer','91',1193),(10194,'Makole','92',1193),(10195,'Mirna','93',1193),(10196,'Mokronog-Trebelno','94',1193),(10197,'Odranci','95',1193),(10198,'Oplotnica','96',1193),(10199,'Ormož','97',1193),(10200,'Osilnica','98',1193),(10201,'Pesnica','99',1193),(10202,'Piran','100',1193),(10203,'Pivka','101',1193),(10204,'PodÄetrtek','102',1193),(10205,'Podlehnik','103',1193),(10206,'Podvelka','104',1193),(10207,'PoljÄane','105',1193),(10208,'Polzela','106',1193),(10209,'Postojna','107',1193),(10210,'Prebold','108',1193),(10211,'Preddvor','109',1193),(10212,'Prevalje','110',1193),(10213,'Ptuj','111',1193),(10214,'Puconci','112',1193),(10215,'RaÄe-Fram','113',1193),(10216,'RadeÄe','114',1193),(10217,'Radenci','115',1193),(10218,'Radlje ob Dravi','139',1193),(10219,'Radovljica','145',1193),(10220,'Ravne na KoroÅ¡kem','171',1193),(10221,'Razkrižje','172',1193),(10222,'ReÄica ob Savinji','173',1193),(10223,'RenÄe-Vogrsko','174',1193),(10224,'Ribnica','175',1193),(10225,'Ribnica na Pohorju','176',1193),(10226,'RogaÅ¡ka Slatina','177',1193),(10227,'RogaÅ¡ovci','178',1193),(10228,'Rogatec','179',1193),(10229,'RuÅ¡e','180',1193),(10230,'Selnica ob Dravi','195',1193),(10231,'SemiÄ','196',1193),(10232,'Å entrupert','197',1193),(10233,'Sevnica','198',1193),(10234,'Sežana','199',1193),(10235,'Slovenj Gradec','200',1193),(10236,'Slovenska Bistrica','201',1193),(10237,'Slovenske Konjice','202',1193),(10238,'Å marjeÅ¡ke Toplice','203',1193),(10239,'Sodražica','204',1193),(10240,'SolÄava','205',1193),(10241,'SrediÅ¡Äe ob Dravi','206',1193),(10242,'StarÅ¡e','207',1193),(10243,'Straža','208',1193),(10244,'Sveta Trojica v Slovenskih goricah','209',1193),(10245,'Sveti Jurij v Slovenskih goricah','210',1193),(10246,'Sveti Tomaž','211',1193),(10247,'Vodice','212',1193),(10248,'Abkhazia','AB',1081),(10249,'Adjara','AJ',1081),(10250,'Tbilisi','TB',1081),(10251,'Guria','GU',1081),(10252,'Imereti','IM',1081),(10253,'Kakheti','KA',1081),(10254,'Kvemo Kartli','KK',1081),(10255,'Mtskheta-Mtianeti','MM',1081),(10256,'Racha-Lechkhumi and Kvemo Svaneti','RL',1081),(10257,'Samegrelo-Zemo Svaneti','SZ',1081),(10258,'Samtskhe-Javakheti','SJ',1081),(10259,'Shida Kartli','SK',1081),(10260,'Central','C',1074),(10261,'Punjab','PB',1163),(10262,'La Libertad','LI',1066),(10263,'La Paz','PA',1066),(10264,'La Union','UN',1066),(10265,'Littoral','LT',1038),(10266,'Nord-Ouest','NW',1038),(10267,'Telangana','TG',1101),(10268,'Ash Sharqiyah','04',1187),(10269,'Guadeloupe','GP',1076),(10270,'Martinique','MQ',1076),(10271,'Guyane','GF',1076),(10272,'La Réunion','RE',1076),(10273,'Mayotte','YT',1076),(10274,'Baringo','01',1112),(10275,'Bomet','02',1112),(10276,'Bungoma','03',1112),(10277,'Busia','04',1112),(10278,'Elgeyo/Marakwet','05',1112),(10279,'Embu','06',1112),(10280,'Garissa','07',1112),(10281,'Homa Bay','08',1112),(10282,'Isiolo','09',1112),(10283,'Kajiado','10',1112),(10284,'Kakamega','11',1112),(10285,'Kericho','12',1112),(10286,'Kiambu','13',1112),(10287,'Kilifi','14',1112),(10288,'Kirinyaga','15',1112),(10289,'Kisii','16',1112),(10290,'Kisumu','17',1112),(10291,'Kitui','18',1112),(10292,'Kwale','19',1112),(10293,'Laikipia','20',1112),(10294,'Lamu','21',1112),(10295,'Machakos','22',1112),(10296,'Makueni','23',1112),(10297,'Mandera','24',1112),(10298,'Marsabit','25',1112),(10299,'Meru','26',1112),(10300,'Migori','27',1112),(10301,'Mombasa','28',1112),(10302,'Murang\'a','29',1112),(10303,'Nairobi City','30',1112),(10304,'Nakuru','31',1112),(10305,'Nandi','32',1112),(10306,'Narok','33',1112),(10307,'Nyamira','34',1112),(10308,'Nyandarua','35',1112),(10309,'Nyeri','36',1112),(10310,'Samburu','37',1112),(10311,'Siaya','38',1112),(10312,'Taita/Taveta','39',1112),(10313,'Tana River','40',1112),(10314,'Tharaka-Nithi','41',1112),(10315,'Trans Nzoia','42',1112),(10316,'Turkana','43',1112),(10317,'Uasin Gishu','44',1112),(10318,'Vihiga','45',1112),(10319,'Wajir','46',1112),(10320,'West Pokot','47',1112);
/*!40000 ALTER TABLE `civicrm_state_province` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1583,8 +1583,8 @@ INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`,
DROP TABLE IF EXISTS `civicrm_value_donor_information_3`;
CREATE TABLE IF NOT EXISTS `civicrm_value_donor_information_3` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Default MySQL primary key', `entity_id` int(10) unsigned NOT NULL COMMENT 'Table that this extends', `known_areas_of_interest_5` text COLLATE utf8_unicode_ci, `how_long_have_you_been_a_donor_6` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique_entity_id` (`entity_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 9, 1, 1, 0, 'dummy', NULL, NULL, 'http://dummy.com', NULL, 'http://dummyrecur.com', NULL, NULL, 'Payment_Dummy', 1, 1, 1);
-INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 9, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Payment_Dummy', 1, 1, 1);
+INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 8, 1, 1, 0, 'dummy', NULL, NULL, 'http://dummy.com', NULL, 'http://dummyrecur.com', NULL, NULL, 'Payment_Dummy', 1, 1, 1);
+INSERT INTO `civicrm_payment_processor` (`domain_id`, `name`, `description`, `payment_processor_type_id`, `is_active`, `is_default`, `is_test`, `user_name`, `password`, `signature`, `url_site`, `url_api`, `url_recur`, `url_button`, `subject`, `class_name`, `billing_mode`, `is_recur`, `payment_type`) VALUES (1, 'Test Processor', '', 8, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Payment_Dummy', 1, 1, 1);
SELECT @dp := max(id) from civicrm_payment_processor where name = 'Test Processor' AND is_test = 0;
SELECT @dpTest := max(id) from civicrm_payment_processor where name = 'Test Processor' AND is_test = 1;
diff --git a/civicrm/sql/civicrm_navigation.mysql b/civicrm/sql/civicrm_navigation.mysql
index f55cd6bb54..022d290c29 100644
--- a/civicrm/sql/civicrm_navigation.mysql
+++ b/civicrm/sql/civicrm_navigation.mysql
@@ -157,7 +157,6 @@ VALUES
( @domainID, 'civicrm/admin/contribute/managePremiums?reset=1', 'Premiums (Thank-you Gifts)', 'Premiums', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 12 ),
( @domainID, 'civicrm/admin/price?reset=1&action=add', 'New Price Set', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', NULL, 13 ),
( @domainID, 'civicrm/admin/price?reset=1', 'Manage Price Sets', 'Manage Price Sets', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 14 ),
- ( @domainID, 'civicrm/admin/contribute/closeaccperiod?reset=1', 'Close Accounting Period', 'Close Accounting Period', 'access CiviContribute,administer CiviCRM,administer Accounting', 'AND', @contributionlastID, '1', NULL, 15 ),
( @domainID, 'civicrm/financial/batch?reset=1&action=add', 'New Batch', 'New Batch', 'create manual batch', 'AND', @financialTransactionID, '1', NULL, 1 ),
( @domainID, 'civicrm/financial/financialbatches?reset=1&batchStatus=1', 'Open Batches', 'Open Batches', 'view own manual batches,view all manual batches', 'OR', @financialTransactionID, '1', NULL, 2 ),
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
index 1835f4c330..d1f23594d2 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
@@ -68,7 +68,8 @@
{if $hookLinks}
{foreach from=$hookLinks item=link}
<li>
- <a href="{$link.url}" data-tab="activity"{if !empty($link.title)} title="{$link.title}"{/if}>
+ <a href="{$link.url}" data-tab="activity"{if !empty($link.title)} title="{$link.title}"{/if}
+ {if !empty($link.class)} class="{$link.class}"{/if}>
{if $link.img}
<img src="{$link.img}" alt="{$link.title}" />
{/if}
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
index 5af6d8c6ea..e57a71bcc3 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
@@ -47,12 +47,8 @@
<td>{$contactDetails.$activityId.$fName}</td>
{/foreach}
{foreach from=$fields item=field key=fieldName}
- {assign var=n value=$field.name}
- {if $fields.$n.name eq 'activity_date_time' }
- <td class="compressed">{include file="CRM/common/jcalendar.tpl" elementName=$fieldName elementIndex=$activityId batchUpdate=1}</td>
- {else}
+ {assign var=n value=$field.name}
<td class="compressed">{$form.field.$activityId.$n.html}</td>
- {/if}
{/foreach}
</tr>
{/foreach}
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
index bb98b83295..7daf986916 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
@@ -31,10 +31,6 @@
$("#deferred_revenue_enabled").click(function() {
showHideElement('deferred_revenue_enabled', 'default_invoice_page');
});
- showHideElement('financial_account_bal_enable', 'fiscalYearStart');
- $("#financial_account_bal_enable").click(function() {
- showHideElement('financial_account_bal_enable', 'fiscalYearStart');
- });
function showHideElement(checkEle, toHide) {
if ($('#' + checkEle).prop('checked')) {
$("tr.crm-preferences-form-block-" + toHide).show();
@@ -43,15 +39,6 @@
$("tr.crm-preferences-form-block-" + toHide).hide();
}
}
- $('input[name=_qf_Contribute_next]').on('click', checkPeriod);
- function checkPeriod() {
- var speriod = $('#prior_financial_period').val();
- var hperiod = '{/literal}{$priorFinancialPeriod}{literal}';
- if (((hperiod && speriod == '') || (hperiod && speriod != '')) && (speriod != hperiod)) {
- var msg = '{/literal}{ts}Changing the Prior Financial Period may result in problems calculating closing account balances accurately and / or exporting of financial transactions. Do you want to proceed?{/ts}{literal}';
- return confirm(msg);
- }
- }
});
</script>
{/literal}
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
index e0f68826e5..aa5a8766f3 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
@@ -37,6 +37,12 @@
<td>{$form.includeEmailInName.html}<br />
<span class="description">{ts}If enabled, email addresses are automatically included when users search by Name. Disabling this feature will speed up search significantly for larger databases, but users will need to use the Email search fields (from Advanced Search, Search Builder, or Profiles) to find contacts by email address.{/ts}</span></td>
</tr>
+ <tr class="crm-search-setting-form-block-searchPrimaryDetailsOnly">
+ <td class="label">{$form.searchPrimaryDetailsOnly.label}</td>
+ <td>{$form.searchPrimaryDetailsOnly.html}<br />
+ <span class="description">{ts}If enabled, only primary details (eg contact's primary email, phone, etc) will be included in Basic and Advanced Search results. Disabling this feature will allow users to match contacts using any email, phone etc detail.{/ts}</span>
+ </td>
+ </tr>
<tr class="crm-search-setting-form-block-includeNickNameInName">
<td class="label">{$form.includeNickNameInName.label}</td>
<td>{$form.includeNickNameInName.html}<br />
diff --git a/civicrm/templates/CRM/Admin/Page/Navigation.tpl b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
index 094507f80b..e37969e883 100644
--- a/civicrm/templates/CRM/Admin/Page/Navigation.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
@@ -39,6 +39,7 @@
</span><br/><br/>
</div>
<div class="spacer"></div>
+ <div style="padding-left: 25px;"><div class="crm-logo-sm"></div></div>
<div id="navigation-tree" class="navigation-tree" style="height:auto; border-collapse:separate; background-color:#FFFFFF;"></div>
<div class="spacer"></div>
<div>
@@ -50,123 +51,101 @@
<div class="spacer"></div>
</div>
{literal}
- <style type="text/css">
- #navigation-tree li {
- font-weight: normal;
- }
- #navigation-tree > ul > li {
- font-weight: bold;
- }
- </style>
<script type="text/javascript">
CRM.$(function($) {
$("#navigation-tree").jstree({
- plugins: [ "themes", "json_data", "dnd","ui", "crrm","contextmenu" ],
- json_data: {
- ajax:{
- dataType: "json",
- url: {/literal}"{crmURL p='civicrm/ajax/menu' h=0 q='key='}{crmKey name='civicrm/ajax/menu'}"{literal}
+ plugins: ["dnd", "contextmenu"],
+ core: {
+ data: function(tree, callBack) {
+ CRM.api3('Navigation', 'get', {
+ domain_id: {/literal}{$config->domainID()}{literal},
+ options: {limit: 0, sort: 'weight'},
+ return: ['label', 'parent_id'],
+ name: {'!=': 'Home'},
+ sequential: 1
+ }).done(function(data) {
+ var items = [];
+ $.each(data.values, function(key, value) {
+ items.push({
+ id: value.id,
+ text: value.label,
+ icon: false,
+ parent: value.parent_id || '#'
+ });
+ });
+ callBack(items);
+ });
},
- progressive_render: true
- },
- themes: {
- "theme": 'classic',
- "dots": true,
- "icons": false,
- "url": CRM.config.resourceBase + 'packages/jquery/plugins/jstree/themes/classic/style.css'
+ progressive_render: true,
+ check_callback: true
},
- rules: {
- droppable: [ "tree-drop" ],
- multiple: true,
- deletable: "all",
- draggable: "all"
- },
- crrm: {
- move: {
- check_move: function(m) {
- var homeMenuId = {/literal}"{$homeMenuId}"{literal};
- if ( $( m.r[0] ).attr('id').replace("node_","") == homeMenuId ||
- $( m.o[0] ).attr('id').replace("node_","") == homeMenuId ) {
- return false;
- } else {
- return true;
- }
- }
- }
+ dnd: {
+ copy: false
},
contextmenu: {
- items: {
- create: false,
- ccp: {
- label : "{/literal}{ts escape='js'}Edit{/ts}{literal}",
- visible: function (node, obj) { if(node.length != 1) return false;
- return obj.check("renameable", node); },
- action: function (node, obj) {
- var nid = $(node).prop('id');
- var nodeID = nid.substr( 5 );
- var editURL = {/literal}"{crmURL p='civicrm/admin/menu' h=0 q='action=update&reset=1&id='}"{literal} + nodeID;
- CRM.loadForm(editURL).on('crmFormSuccess', function() {
- $("#navigation-tree").jstree('refresh');
- $("#reset-menu").show( );
- });
+ items: function (node, callBack) {
+ var items = {
+ add: {
+ label: "{/literal}{ts escape='js'}Add{/ts}{literal}",
+ icon: 'crm-i fa-plus',
+ action: editForm
+ },
+ edit: {
+ label: "{/literal}{ts escape='js'}Edit{/ts}{literal}",
+ icon: 'crm-i fa-pencil',
+ action: editForm
},
- submenu: false
- }
+ delete: {
+ label: "{/literal}{ts escape='js'}Delete{/ts}{literal}",
+ icon: 'crm-i fa-trash',
+ action: function (menu) {
+ var nodeID = menu.reference.attr('id').replace('_anchor', ''),
+ node = $("#navigation-tree").jstree(true).get_node(nodeID),
+ menuName = node.text;
+ var deleteMsg = {/literal}"{ts escape='js'}Are you sure you want to delete this menu item:{/ts} " + '"'{literal} + menuName + {/literal}'"? {ts escape='js'}This action cannot be undone.{/ts}'{literal};
+ if (node.children.length) {
+ deleteMsg += {/literal}"<br /><br />" + ts('{ts escape='js' 1='<strong>%1</strong>'}%1 sub-menu items will also be deleted.{/ts}'{literal}, {1: node.children.length});
+ }
+ CRM.confirm({message: deleteMsg})
+ .on('crmConfirm:yes', function() {
+ CRM.api3('Navigation', 'delete', {id: nodeID}, true);
+ $("#navigation-tree").jstree(true).delete_node(menu.reference.closest('li'));
+ $("#reset-menu").show();
+ });
+ }
+ }
+ };
+ callBack(items);
}
}
-
- }).bind("rename.jstree", function ( e,node ) {
- var nodeID = node.rslt.obj.attr('id').replace("node_","");
- var newName = node.rslt.new_name;
+ }).on("move_node.jstree", function (e, data) {
+ var nodeID = data.node.id;
+ var refID = data.parent === '#' ? '' : data.parent;
+ var ps = data.position;
var postURL = {/literal}"{crmURL p='civicrm/ajax/menutree' h=0 q='key='}{crmKey name='civicrm/ajax/menutree'}"{literal};
- $.get( postURL + '&type=rename&id=' + nodeID + '&data=' + newName,
- function (data) {
- $("#reset-menu").show( );
- }
- );
-
- }).bind("remove.jstree", function( e,node ) {
- var menuName = node.rslt.obj.find('a').first( ).text( );
- var nodeID = node.rslt.obj.attr('id').replace("node_","");
+ CRM.status({}, $.get( postURL + '&type=move&id=' + nodeID + '&ref_id=' + refID + '&ps='+ps));
+ $("#reset-menu").show();
+ });
- // don't allow deleting of home
- var homeMenuId = {/literal}"{$homeMenuId}"{literal};
- if ( nodeID == homeMenuId ) {
- var cannotDeleteMsg = {/literal}"{ts escape='js'}You cannot delete this menu item:{/ts}" + " "{literal} + menuName;
- CRM.alert( cannotDeleteMsg, {/literal}"{ts escape='js'}Cannot Delete{/ts}"{literal} );
- $("#navigation-tree").jstree('refresh');
- return false;
- }
- var deleteMsg = {/literal}"{ts escape='js'}Are you sure you want to delete this menu item:{/ts}" + " "{literal} + menuName + {/literal}" ? {ts}This action cannot be undone.{/ts}"{literal};
- var isDelete = confirm( deleteMsg );
- if ( isDelete ) {
- var postURL = {/literal}"{crmURL p='civicrm/ajax/menutree' h=0 q='key='}{crmKey name='civicrm/ajax/menutree'}"{literal};
- $.get( postURL + '&type=delete&id=' + nodeID,
- function (data) {
- $("#reset-menu").show( );
- }
- );
+ function editForm(menu) {
+ var nodeID = menu.reference.attr('id').replace('_anchor', ''),
+ action = menu.item.icon === 'crm-i fa-pencil' ? 'update' : 'add',
+ args = {reset: 1, action: action};
+ if (action === 'add') {
+ args.parent_id = nodeID;
} else {
- $("#navigation-tree").jstree('refresh');
+ args.id = nodeID;
}
-
- }).bind("move_node.jstree", function ( e,node ) {
- node.rslt.o.each(function (i) {
- var nodeID = node.rslt.o.attr('id').replace("node_","");
- var refID = node.rslt.np.attr('id').replace("node_","");
- if (isNaN( refID ) ){ refID =''; }
- var ps = node.rslt.cp+i;
- var postURL = {/literal}"{crmURL p='civicrm/ajax/menutree' h=0 q='key='}{crmKey name='civicrm/ajax/menutree'}"{literal};
- $.get( postURL + '&type=move&id=' + nodeID + '&ref_id=' + refID + '&ps='+ps,
- function (data) {
- $("#reset-menu").show( );
- });
+ CRM.loadForm(CRM.url('civicrm/admin/menu', args)).on('crmFormSuccess', function() {
+ $("#navigation-tree").jstree(true).refresh();
+ $("#reset-menu").show();
});
- });
+ }
+
$('#new-menu-item a.button')
.on('click', CRM.popup)
.on('crmPopupFormSuccess', function() {
- $("#navigation-tree").jstree('refresh');
+ $("#navigation-tree").jstree(true).refresh();
$("#reset-menu").show();
});
@@ -181,7 +160,7 @@
CRM.api3('Navigation', 'reset', {'for': 'report'}, true)
.done(function() {
$('#crm-container').unblock();
- $("#navigation-tree").jstree('refresh');
+ $("#navigation-tree").jstree(true).refresh();
$("#reset-menu").show();
})
});
diff --git a/civicrm/templates/CRM/Batch/Form/Entry.tpl b/civicrm/templates/CRM/Batch/Form/Entry.tpl
index a54396e8e0..6be276ec9e 100644
--- a/civicrm/templates/CRM/Batch/Form/Entry.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Entry.tpl
@@ -93,7 +93,7 @@
{/if}
{foreach from=$fields item=field key=fieldName}
{assign var=n value=$field.name}
- {if in_array( $n, array( 'thankyou_date', 'cancel_date', 'receipt_date', 'receive_date', 'join_date', 'membership_start_date', 'membership_end_date' ) ) }
+ {if in_array( $n, array( 'thankyou_date', 'cancel_date', 'receipt_date', 'receive_date') ) }
<div class="compressed crm-grid-cell">
<span class="crm-batch-{$n}-{$rowNumber}">
{include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$rowNumber batchUpdate=1}
@@ -255,7 +255,8 @@ function checkColumns(parentRow) {
parentRow.find('div .required').each(function () {
//special case to handle contact autocomplete select
var fieldId = cj(this).attr('id');
- if (fieldId.substring(0, 16) == 'primary_contact_') {
+ // datepicker hasTimeEntry would not have an id - not sure why.
+ if (typeof fieldId != 'undefined' && fieldId.substring(0, 16) == 'primary_contact_') {
// if display value is set then make sure we also check if contact id is set
if (!cj(this).val()) {
inValidRow++;
@@ -386,7 +387,7 @@ function updateContactInfo(blockNo, prefix) {
cj('select[id="member_option_' + blockNo + '"]').prop('disabled', false).val(2);
cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
- setDateFieldValue('join_date', membershipJoinDate, blockNo)
+ cj('#field_' + blockNo + '_' + 'join_date').val(membershipJoinDate).trigger('change');
}
});
}
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
index ad7d9a77ce..067c6b2e9e 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -214,8 +214,7 @@
"oLanguage": {"sEmptyTable": noRecordFoundMsg,
"sZeroRecords": noRecordFoundMsg },
"fnDrawCallback": function () {
- // FIXME: trigger crmLoad and crmEditable would happen automatically
- $('.crm-editable').crmEditable();
+ $(this).trigger('crmLoad');
},
"fnRowCallback": function (nRow, aData, iDisplayIndex) {
//insert the id for each row for enable/disable.
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
index 6f54ea14ac..08da9d8157 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -198,8 +198,7 @@ function loadPetitionList( )
"oLanguage":{"sEmptyTable" : noRecordFoundMsg,
"sZeroRecords" : noRecordFoundMsg },
"fnDrawCallback": function() {
- // FIXME: trigger crmLoad and crmEditable would happen automatically
- CRM.$('.crm-editable').crmEditable();
+ $(this).trigger('crmLoad');
},
"fnRowCallback": function( nRow, aData, iDisplayIndex ) {
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
index ceb44095f4..2b72618d58 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -212,8 +212,7 @@ function loadSurveyList( )
"oLanguage":{"sEmptyTable" : noRecordFoundMsg,
"sZeroRecords" : noRecordFoundMsg },
"fnDrawCallback": function() {
- // FIXME: trigger crmLoad and crmEditable would happen automatically
- CRM.$('.crm-editable').crmEditable();
+ $(this).trigger('crmLoad');
},
"fnRowCallback": function( nRow, aData, iDisplayIndex ) {
// Crm-editable
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
index 4a563b2fec..1b6113be30 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -37,7 +37,7 @@
</div>
<div class="form-item">
<span class="label">{$form.birth_date.label}</span>
- <span class="value">{include file="CRM/common/jcalendar.tpl" elementName=birth_date}</span>
+ <span class="fields">{$form.birth_date.html}</span>
</div>
<div class="form-item">
{$form.is_deceased.html}
@@ -45,7 +45,7 @@
</div>
<div id="showDeceasedDate" class="form-item">
<span class="label">{$form.deceased_date.label}</span>
- <span class="value">{include file="CRM/common/jcalendar.tpl" elementName=deceased_date}</span>
+ <span class="fields">{$form.deceased_date.html}</span>
</div>
</div><!-- /.crm-accordion-body -->
</div><!-- /.crm-accordion-wrapper -->
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index ba423175a2..df271f19d1 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -93,8 +93,17 @@
<td>
{if $groupElementType eq 'select'}
<span class="label">{if $title}{$form.group.label}{/if}</span>
+ {$form.group.html}
+ {else}
+ {foreach key=key item=item from=$tagGroup.group}
+ <div class="group-wrapper">
+ {$form.group.$key.html}
+ {if $item.description}
+ <div class="description">{$item.description}</div>
+ {/if}
+ </div>
+ {/foreach}
{/if}
- {$form.group.html}
</td>
{/if}
{if (!$type || $type eq 'tag') && $tree}
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 315884de97..dbc3b9dbc1 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -37,7 +37,7 @@
<div class="crm-summary-row">
<div class="crm-label">{$form.birth_date.label}</div>
<div class="crm-content">
- {include file="CRM/common/jcalendar.tpl" elementName=birth_date}
+ {$form.birth_date.html}
</div>
</div>
<div class="crm-summary-row">
@@ -50,7 +50,7 @@
<div class="crm-summary-row">
<div class="crm-label crm-deceased-date">{$form.deceased_date.label}</div>
<div class="crm-content crm-deceased-date">
- {include file="CRM/common/jcalendar.tpl" elementName=deceased_date}
+ {$form.deceased_date.html}
</div>
</div>
</div>
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
index 0f138c7dc2..2309aaa448 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
@@ -49,6 +49,14 @@
</table>
</div>
{/if}
+ <div class="crm-field-wrapper">
+ {$form.supplemental_address_1.label}<br />
+ {$form.supplemental_address_1.html}
+ </div>
+ <div class="crm-field-wrapper">
+ {$form.supplemental_address_2.label}<br />
+ {$form.supplemental_address_2.html}
+ </div>
<div class="crm-field-wrapper">
{$form.city.label}<br />
{$form.city.html}
@@ -158,5 +166,3 @@
</script>
{/literal}
{/if}
-
-
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
index 74485a1cae..1653ecb883 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
@@ -73,8 +73,6 @@
</table>
{/strip}
</td>
- {elseif ( $n eq 'birth_date' or $n eq 'deceased_date' ) }
- <td class="compressed">{include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$cid batchUpdate=1}</td>
{elseif $n|substr:0:5 eq 'phone'}
<td class="compressed">
{assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
index fc9b0f0ae1..a2dabf1fba 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -34,14 +34,12 @@
<div class="crm-label">{ts}Gender{/ts}</div>
<div class="crm-content crm-contact-gender_display">{$gender_display}</div>
</div>
+
<div class="crm-summary-row">
<div class="crm-label">{ts}Date of Birth{/ts}</div>
<div class="crm-content crm-contact-birth_date_display">
- {if $birthDateViewFormat}
- {$birth_date_display|crmDate:$birthDateViewFormat}
- {else}
- {$birth_date_display|crmDate}
- {/if}
+ {assign var="date_format" value = $fields.birth_date.smarty_view_format}
+ {$birth_date|crmDate:$date_format}
</div>
</div>
@@ -50,11 +48,7 @@
<div class="crm-summary-row">
<div class="crm-label">{ts}Date Deceased{/ts}</div>
<div class="crm-content crm-contact-deceased_date_display">
- {if $birthDateViewFormat}
- {$deceased_date_display|crmDate:$birthDateViewFormat}
- {else}
- {$deceased_date_display|crmDate}
- {/if}
+ {$deceased_date}
</div>
</div>
{else}
diff --git a/civicrm/templates/CRM/Contribute/Form/CloseAccPeriod.tpl b/civicrm/templates/CRM/Contribute/Form/CloseAccPeriod.tpl
deleted file mode 100644
index 4624d68d5b..0000000000
--- a/civicrm/templates/CRM/Contribute/Form/CloseAccPeriod.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
-*}
-
-<table class="form-layout-compressed">
- <tr>
- <td class="label">{$form.closing_date.label}</td>
- <td class="content">{$form.closing_date.html}</td>
- </tr>
-</table>
-
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
\ No newline at end of file
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
index 79e7ff60b6..db34df3c08 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
@@ -520,9 +520,10 @@
});
</script>
{if !$contributionMode}
+ {crmAPI var="checkVal" entity="OptionValue" action="getvalue" version="3" option_group_id="payment_instrument" name="Check" return="value"}
{include file="CRM/common/showHideByFieldValue.tpl"
trigger_field_id ="payment_instrument_id"
- trigger_value = '4'
+ trigger_value = $checkVal
target_element_id ="checkNumber"
target_element_type ="table-row"
field_type ="select"
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
index cce60043ed..7de97eaae7 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -162,13 +162,7 @@
</span>
{/if}
<div id="recurHelp" class="description">
- {ts}Your recurring contribution will be processed automatically.{/ts}
- {if $is_recur_installments}
- {ts}You can specify the number of installments, or you can leave the number of installments blank if you want to make an open-ended commitment. In either case, you can choose to cancel at any time.{/ts}
- {/if}
- {if $is_email_receipt}
- {ts}You will receive an email receipt for each recurring contribution.{/ts}
- {/if}
+ {$recurringHelpText}
</div>
</div>
<div class="clear"></div>
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index a03341619a..2a09fe159f 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -62,7 +62,7 @@
{/if}
</div>
{/if}
- {elseif $contributeMode EQ 'notify' OR ($contributeMode EQ 'direct' && $is_recur) }
+ {elseif $isPendingOutcome}
<div>{ts 1=$paymentProcessor.name}Your contribution has been submitted to %1 for processing. Please print this page for your records.{/ts}</div>
{if $is_email_receipt}
<div>
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
index 6e2ff965a0..d90cc57bfd 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -47,6 +47,10 @@
{$form.contribution_check_number.label} <br />
{$form.contribution_check_number.html}
</div>
+ <div class="float-left" id="financial_trxn_card_type_wrapper">
+ {$form.financial_trxn_card_type.label} <br />
+ {$form.financial_trxn_card_type.html}
+ </div>
</td>
<td>
{$form.contribution_trxn_id.label} <br />
diff --git a/civicrm/templates/CRM/Contribute/Form/Selector.tpl b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
index 10e975d032..0cd542008e 100644
--- a/civicrm/templates/CRM/Contribute/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
@@ -65,7 +65,7 @@
</a>
{/if}
{if $row.amount_level }<br/>({$row.amount_level}){/if}
- {if $row.contribution_recur_id}<br/>{ts}(Recurring Contribution){/ts}{/if}
+ {if $row.contribution_recur_id}<br/>{ts}(Recurring){/ts}{/if}
</td>
{if $softCreditColumns}
<td class="right bold crm-contribution-soft_credit_amount">
diff --git a/civicrm/templates/CRM/Core/BillingBlock.js b/civicrm/templates/CRM/Core/BillingBlock.js
index 4d75202f6e..e170975ac8 100644
--- a/civicrm/templates/CRM/Core/BillingBlock.js
+++ b/civicrm/templates/CRM/Core/BillingBlock.js
@@ -8,34 +8,36 @@
* Removes spaces and dashes from credit card numbers.
*/
function civicrm_billingblock_creditcard_helper() {
- $.each(CRM.config.creditCardTypes, function(key, val) {
- var html = '<a href="#" title="' + val + '" class="crm-credit_card_type-icon-' + key + '"><span>' + val + '</span></a>';
- $('.crm-credit_card_type-icons').append(html);
+ $(function() {
+ $.each(CRM.config.creditCardTypes, function(key, val) {
+ var html = '<a href="#" title="' + val + '" class="crm-credit_card_type-icon-' + key + '"><span>' + val + '</span></a>';
+ $('.crm-credit_card_type-icons').append(html);
- $('.crm-credit_card_type-icon-' + key).click(function() {
- $('#credit_card_type').val(val);
- $('.crm-container .credit_card_type-section a').css('opacity', 0.25);
- $('.crm-container .credit_card_type-section .crm-credit_card_type-icon-' + key).css('opacity', 1);
- return false;
+ $('.crm-credit_card_type-icon-' + key).click(function() {
+ $('#credit_card_type').val(val);
+ $('.crm-container .credit_card_type-section a').css('opacity', 0.25);
+ $('.crm-container .credit_card_type-section .crm-credit_card_type-icon-' + key).css('opacity', 1);
+ return false;
+ });
});
- });
- // Hide the CC type field (redundant)
- $('#credit_card_type, .label', '.crm-container .credit_card_type-section').hide();
+ // Hide the CC type field (redundant)
+ $('#credit_card_type, .label', '.crm-container .credit_card_type-section').hide();
- // Select according to the number entered
- $('.crm-container input#credit_card_number').change(function() {
- var ccnumber = cj(this).val();
+ // Select according to the number entered
+ $('.crm-container input#credit_card_number').change(function() {
+ var ccnumber = cj(this).val();
- // Remove spaces and dashes
- ccnumber = ccnumber.replace(/[- ]/g, '');
- cj(this).val(ccnumber);
+ // Remove spaces and dashes
+ ccnumber = ccnumber.replace(/[- ]/g, '');
+ cj(this).val(ccnumber);
- // Semi-hide all images, we will un-hide the right one afterwards
- $('.crm-container .credit_card_type-section a').css('opacity', 0.25);
- $('#credit_card_type').val('');
+ // Semi-hide all images, we will un-hide the right one afterwards
+ $('.crm-container .credit_card_type-section a').css('opacity', 0.25);
+ $('#credit_card_type').val('');
- civicrm_billingblock_set_card_type(ccnumber);
+ civicrm_billingblock_set_card_type(ccnumber);
+ });
});
}
diff --git a/civicrm/templates/CRM/Custom/Page/Option.tpl b/civicrm/templates/CRM/Custom/Page/Option.tpl
index cf9aa881c7..7cd373f67d 100644
--- a/civicrm/templates/CRM/Custom/Page/Option.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Option.tpl
@@ -105,8 +105,7 @@
return nRow;
},
"fnDrawCallback": function() {
- // FIXME: trigger crmLoad and crmEditable would happen automatically
- $('.crm-editable').crmEditable();
+ $(this).trigger('crmLoad');
},
"fnServerData": function ( sSource, aoData, fnCallback ) {
diff --git a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
index 729e39bb7c..3ee2e1597d 100644
--- a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
@@ -104,12 +104,17 @@
$(this).one('crmAccordion:open', function () {
$('.crm-news-feed-item-title', this).css('font-weight', '');
$('em', $tab).text(--count);
+ if (!count) {
+ $('em', $tab).remove();
+ }
opened[key].push(itemKey);
localStorage.newsFeed = JSON.stringify(opened);
});
}
});
- $tab.html($tab.text() + ' <em>' + count + '</em>');
+ if (count) {
+ $tab.html($tab.text() + ' <em>' + count + '</em>');
+ }
// Remove items from localstorage that are no longer in the current feed
$.each(opened[key], function(i, itemKey) {
if (!$('a[href="' + itemKey + '"]', $content).length) {
diff --git a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
index 883c7af87b..d5f5f04255 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
@@ -101,8 +101,6 @@
</table>
{/strip}
</td>
- {elseif ( $n eq 'participant_register_date' ) }
- <td class="compressed">{include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$pid batchUpdate=1}</td>
{else}
<td class="compressed">{$form.field.$pid.$n.html}</td>
{/if}
diff --git a/civicrm/templates/CRM/Financial/Form/Search.tpl b/civicrm/templates/CRM/Financial/Form/Search.tpl
index ec4695a14c..9e0c7543e4 100644
--- a/civicrm/templates/CRM/Financial/Form/Search.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Search.tpl
@@ -149,8 +149,7 @@ CRM.$(function($) {
return nRow;
},
"fnDrawCallback": function(oSettings) {
- // FIXME: trigger crmLoad and crmEditable would happen automatically
- $('.crm-editable', '#crm-batch-selector-{/literal}{$batchStatus}{literal}').crmEditable();
+ $(this).trigger('crmLoad');
$("#toggleSelect").prop('checked', false);
if (checkedRows.length) {
$(checkedRows.join(',')).prop('checked', true).change();
diff --git a/civicrm/templates/CRM/Form/basicForm.tpl b/civicrm/templates/CRM/Form/basicForm.tpl
index cb30a35ba4..2b15663b41 100644
--- a/civicrm/templates/CRM/Form/basicForm.tpl
+++ b/civicrm/templates/CRM/Form/basicForm.tpl
@@ -42,11 +42,7 @@
{else}
<td class="label">{$form.$htmlField.label} {if $htmlField eq 'acl_financial_type'}{help id="$htmlField"}{/if}</td>
<td>
- {if $htmlField eq 'prior_financial_period'}
- {include file="CRM/common/jcalendar.tpl" elementName=$htmlField}
- {else}
- {$form.$htmlField.html}
- {/if}
+ {$form.$htmlField.html}
{if $desc}
<br /><span class="description">{$desc}</span>
{/if}
@@ -55,8 +51,6 @@
</tr>
{/if}
{/foreach}
- {$form.prior_financial_period_M_hidden.html}
- {$form.prior_financial_period_d_hidden.html}
</table>
{/if}
<table class="form-layout" id="invoicing_blocks">
diff --git a/civicrm/templates/CRM/Group/Form/Search.tpl b/civicrm/templates/CRM/Group/Form/Search.tpl
index bb9f0bd033..5a59dd1a90 100644
--- a/civicrm/templates/CRM/Group/Form/Search.tpl
+++ b/civicrm/templates/CRM/Group/Form/Search.tpl
@@ -142,10 +142,12 @@
//Reload table after draw
$(settings.nTable).trigger('crmLoad');
if (parentsOnly) {
- $('tbody tr.crm-group-parent', settings.nTable).each( function() {
- $(this).find('td:first')
- .prepend('{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span>{literal}')
- .find('div').css({'display': 'inline'});
+ CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmEditable.js').done(function () {
+ $('tbody tr.crm-group-parent', settings.nTable).each(function () {
+ $(this).find('td:first')
+ .prepend('{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span>{literal}')
+ .find('div').css({'display': 'inline'});
+ });
});
}
}
diff --git a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
index b5ff8c9fad..9a7aaad8e1 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
@@ -51,11 +51,7 @@
{foreach from=$fields item=field key=fieldName}
{assign var=n value=$field.name}
- {if ($n eq 'join_date') or ($n eq 'membership_start_date') or ($n eq 'membership_end_date')}
- <td class="compressed">{include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$mid batchUpdate=1}</td>
- {else}
- <td class="compressed">{$form.field.$mid.$n.html}</td>
- {/if}
+ <td class="compressed">{$form.field.$mid.$n.html}</td>
{/foreach}
</tr>
{/foreach}
diff --git a/civicrm/templates/CRM/Price/Form/Calculate.tpl b/civicrm/templates/CRM/Price/Form/Calculate.tpl
index 85c46bccb4..5408df48c6 100644
--- a/civicrm/templates/CRM/Price/Form/Calculate.tpl
+++ b/civicrm/templates/CRM/Price/Form/Calculate.tpl
@@ -150,7 +150,8 @@ function calculateSelectLineItemValue(priceElement) {
*/
function calculateText(priceElement) {
//CRM-16034 - comma acts as decimal in price set text pricing
- var textval = parseFloat(cj(priceElement).val().replace(thousandMarker, ''));
+ //CRM-19937 - dollar sign easy mistake to make by users.
+ var textval = parseFloat(cj(priceElement).val().replace(thousandMarker, '').replace(symbol, ''));
if (isNaN(textval)) {
textval = parseFloat(0);
diff --git a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
index 477c0c5750..7b7725af99 100644
--- a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
@@ -171,12 +171,7 @@
{$form.$phone_ext_field.html}
{/if}
{else}
- {if
- ( ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) or ( $n eq 'activity_date_time' ) ) and $field.is_view neq 1 }
- {include file="CRM/common/jcalendar.tpl" elementName=$n}
- {else}
- {$form.$n.html}
- {/if}
+ {$form.$n.html}
{if $field.html_type eq 'Autocomplete-Select'}
{if $field.data_type eq 'ContactReference'}
{include file="CRM/Custom/Form/ContactReference.tpl" element_name = $n}
diff --git a/civicrm/templates/CRM/Profile/Form/Search.tpl b/civicrm/templates/CRM/Profile/Form/Search.tpl
index 719327e6ef..02ad086f04 100644
--- a/civicrm/templates/CRM/Profile/Form/Search.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Search.tpl
@@ -65,9 +65,7 @@
</td>
{else}
<td class="description">
- {if ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) }
- {include file="CRM/common/jcalendar.tpl" elementName=$n}
- {elseif $n|substr:0:5 eq 'phone'}
+ {if $n|substr:0:5 eq 'phone'}
{assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}
{$form.$n.html}
{if $form.$phone_ext_field.html}
diff --git a/civicrm/templates/CRM/Tag/Form/Tag.tpl b/civicrm/templates/CRM/Tag/Form/Tag.tpl
index b83dffad9c..64ccc9707e 100644
--- a/civicrm/templates/CRM/Tag/Form/Tag.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tag.tpl
@@ -24,6 +24,7 @@
+--------------------------------------------------------------------+
*}
{* this template is used for adding/editing tags *}
+{crmStyle file='bower_components/jstree/dist/themes/default/style.min.css'}
{literal}
<script type="text/javascript">
(function($, _){{/literal}
@@ -31,71 +32,60 @@
entityTable='{$entityTable}',
$form = $('form.{$form.formClass}');
{literal}
- CRM.updateContactSummaryTags = function() {
- var tags = [];
- $('#tagtree input:checkbox:checked+a label').each(function() {
- tags.push('<span class="crm-tag-item" style="' + $(this).attr('style') + '" title="' + ($(this).attr('title') || '') + '">' + $(this).text() + '</span>');
- });
- $('input.crm-contact-tagset').each(function() {
- $.each($(this).select2('data'), function (i, tag) {
- tags.push('<span class="crm-tag-item" title="' + (tag.description || '') + '"' + (tag.color ? 'style="color: ' + CRM.utils.colorContrast(tag.color) + '; background-color: ' + tag.color + ';"' : '') + '>' + tag.label + '</span>');
- });
- });
- // contact summary tabs and search forms both listen for this event
- $($form).closest('.crm-ajax-container').trigger('crmFormSuccess', {tabCount: tags.length});
- // update summary tab
- $("#contact-summary #tags").html(tags.join(' '));
- };
$(function() {
- function highlightSelected() {
- $("ul input:not(:checked)", '#tagtree').each(function () {
- $(this).closest("li").removeClass('highlighted highlighted-child');
+
+ // Display tags on the contact summary
+ function updateContactSummaryTags() {
+ var tags = [],
+ selected = $("#tagtree").jstree(true).get_selected(true);
+ $.each(selected, function(k, item) {
+ var $tag = $(item.text);
+ tags.push('<span class="crm-tag-item" style="' + $tag.attr('style') + '" title="' + ($tag.attr('title') || '') + '">' + $tag.text() + '</span>');
});
- $("ul input:checked", '#tagtree').each(function () {
- $(this).closest("li").addClass('highlighted');
- $(this).parents("li[id^=tag]").addClass('highlighted-child');
+ $('input.crm-contact-tagset').each(function() {
+ $.each($(this).select2('data'), function (i, tag) {
+ tags.push('<span class="crm-tag-item" title="' + (tag.description || '') + '"' + (tag.color ? 'style="color: ' + CRM.utils.colorContrast(tag.color) + '; background-color: ' + tag.color + ';"' : '') + '>' + tag.label + '</span>');
+ });
});
+ // contact summary tabs and search forms both listen for this event
+ $($form).closest('.crm-ajax-container').trigger('crmFormSuccess', {tabCount: tags.length});
+ // update summary tab
+ $("#contact-summary #tags").html(tags.join(' '));
}
- highlightSelected();
- $("#tagtree input").change(function(){
- var tagid = this.id.replace("check_", "");
- var op = (this.checked) ? 'create' : 'delete';
- var api = CRM.api3('entity_tag', op, {entity_table: entityTable, entity_id: entityID, tag_id: tagid}, true);
- highlightSelected();
- CRM.updateContactSummaryTags();
- });
- var childTag = "{/literal}{$loadjsTree}{literal}";
- if (childTag) {
- //load js tree.
+ // Load js tree.
+ CRM.loadScript(CRM.config.resourceBase + 'bower_components/jstree/dist/jstree.min.js').done(function() {
$("#tagtree").jstree({
- plugins : ["themes", "html_data", "search"],
- core: {animation: 100},
+ plugins : ['search', 'wholerow', 'checkbox'],
+ core: {
+ animation: 100,
+ themes: {
+ "theme": 'classic',
+ "dots": false,
+ "icons": false
+ }
+ },
'search': {
'case_insensitive' : true,
'show_only_matches': true
},
- themes: {
- "theme": 'classic',
- "dots": false,
- "icons": false,
- "url": CRM.config.resourceBase + 'packages/jquery/plugins/jstree/themes/classic/style.css'
+ checkbox: {
+ three_state: false
}
- });
- }
- {/literal}
- {if $permission neq 'edit'}
- {literal}
- $("#tagtree input").prop('disabled', true);
- {/literal}
- {/if}
- {literal}
+ })
+ .on('select_node.jstree deselect_node.jstree', function(e, selected) {
+ var id = selected.node.a_attr.id.replace('tag_', ''),
+ op = e.type === 'select_node' ? 'create' : 'delete';
+ CRM.api3('entity_tag', op, {entity_table: entityTable, entity_id: entityID, tag_id: id}, true);
+ updateContactSummaryTags();
+ });
+ });
- $(document).on('change', 'input.crm-contact-tagset', CRM.updateContactSummaryTags);
+ $(document).on('change', 'input.crm-contact-tagset', updateContactSummaryTags);
$('input[name=filter_tag_tree]', '#Tag').on('keyup change', function() {
- $("#tagtree").jstree('search', $(this).val());
+ $("#tagtree").jstree(true).search($(this).val());
});
});
})(CRM.$, CRM._);
diff --git a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
index 5c27022c2a..8f3a1df17e 100644
--- a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
@@ -26,12 +26,11 @@
{* This tpl runs recursively to build each level of the tag tree *}
<ul class="tree-level-{$level}">
{foreach from=$tree item="node" key="id"}
- <li id="tag_{$id}">
- <input name="tagList[{$id}]" id="check_{$id}" type="checkbox" {if $node.is_selectable EQ 0}disabled=""{/if} {if $tagged[$id]}checked="checked"{/if}/>
- <a>
- <label for="check_{$id}" id="tagLabel_{$id}" class="crm-tag-item" {if !empty($allTags.$id.color)}style="background-color: {$allTags.$id.color}; color: {$allTags.$id.color|colorContrast};"{/if} title="{$node.description}">
+ <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}">
{$node.name}
- </label>
+ </span>
</a>
{if $node.children}
{* Recurse... *}
diff --git a/civicrm/templates/CRM/Tag/Page/Tag.tpl b/civicrm/templates/CRM/Tag/Page/Tag.tpl
index a5fc9c91d8..c30187d1b6 100644
--- a/civicrm/templates/CRM/Tag/Page/Tag.tpl
+++ b/civicrm/templates/CRM/Tag/Page/Tag.tpl
@@ -272,10 +272,6 @@
plugins: plugins,
dnd: {
copy: false
- },
- themes: {
- stripes: true,
- dots: false
}
});
}
diff --git a/civicrm/templates/CRM/UF/Form/Fields.tpl b/civicrm/templates/CRM/UF/Form/Fields.tpl
index 4fbe9a4e7e..e16d7305f2 100644
--- a/civicrm/templates/CRM/UF/Form/Fields.tpl
+++ b/civicrm/templates/CRM/UF/Form/Fields.tpl
@@ -90,9 +90,8 @@
{elseif ($profileFieldName eq 'group' && $form.group) || ($profileFieldName eq 'tag' && $form.tag)}
{include file="CRM/Contact/Form/Edit/TagsAndGroups.tpl" type=$profileFieldName title=null context="profile"}
{elseif $field.is_datetime_field && $action & 4}
- {assign var="date_value" value=$form.$profileFieldName.value}
<span class="crm-frozen-field">
- {$date_value|date_format:"%Y-%m-%d"|crmDate:$config->dateformatshortdate}
+ {$form.$profileFieldName.value|crmDate:$field.smarty_view_format}
<input type="hidden"
name="{$form.$profileFieldName.name}"
value="{$form.$profileFieldName.value}" id="{$form.$profileFieldName.name}"
diff --git a/civicrm/templates/CRM/UF/Page/Field.tpl b/civicrm/templates/CRM/UF/Page/Field.tpl
index 61db2dee81..898aeaceb8 100644
--- a/civicrm/templates/CRM/UF/Page/Field.tpl
+++ b/civicrm/templates/CRM/UF/Page/Field.tpl
@@ -51,7 +51,7 @@
{if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules) }
<th>{ts}Visibility{/ts}</th>
<th>{ts}Searchable?{/ts}</th>
- <th>{ts}In Selector?{/ts}</th>
+ <th>{ts}Results Column?{/ts}</th>
{/if}
<th>{ts}Order{/ts}</th>
<th>{ts}Required{/ts}</th>
diff --git a/civicrm/templates/CRM/common/enableDisableApi.tpl b/civicrm/templates/CRM/common/enableDisableApi.tpl
index 049471c302..cb359af23c 100644
--- a/civicrm/templates/CRM/common/enableDisableApi.tpl
+++ b/civicrm/templates/CRM/common/enableDisableApi.tpl
@@ -61,7 +61,6 @@
}
function enableDisable() {
- $a = $(this);
$row = $a.closest('.crm-entity');
info = $a.crmEditableEntity();
fieldLabel = info.label || info.title || info.display_name || info.name || {/literal}'{ts escape="js"}Record{/ts}'{literal};
@@ -79,13 +78,16 @@
} else {
save();
}
- return false;
}
// Because this is an inline script it may get added to the document more than once, so remove handler before adding
$('body')
.off('.crmEnableDisable')
- .on('click.crmEnableDisable', '.action-item.crm-enable-disable', enableDisable);
+ .on('click.crmEnableDisable', '.action-item.crm-enable-disable', function(e) {
+ e.preventDefault();
+ $a = $(this);
+ CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmEditable.js').done(enableDisable);
+ });
});
</script>
{/literal}
diff --git a/civicrm/templates/CRM/common/version.tpl b/civicrm/templates/CRM/common/version.tpl
index bf0a93eb38..62b449b1e5 100644
--- a/civicrm/templates/CRM/common/version.tpl
+++ b/civicrm/templates/CRM/common/version.tpl
@@ -1 +1 @@
-4.7.17
\ No newline at end of file
+4.7.18
\ No newline at end of file
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 6d9fa7f9d9..6ec317b2d2 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -2,6 +2,6 @@
// autoload.php @generated by Composer
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit08ca5e7ba3199d8cc11629f471bf7947::getLoader();
+return ComposerAutoloaderInit9a16b3f3bd333d243a82b7971a3a7c14::getLoader();
diff --git a/civicrm/vendor/composer/ClassLoader.php b/civicrm/vendor/composer/ClassLoader.php
index 4e05d3b158..2c72175e77 100644
--- a/civicrm/vendor/composer/ClassLoader.php
+++ b/civicrm/vendor/composer/ClassLoader.php
@@ -13,9 +13,7 @@
namespace Composer\Autoload;
/**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
@@ -39,6 +37,8 @@ namespace Composer\Autoload;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see http://www.php-fig.org/psr/psr-0/
+ * @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
@@ -53,8 +53,9 @@ class ClassLoader
private $useIncludePath = false;
private $classMap = array();
-
private $classMapAuthoritative = false;
+ private $missingClasses = array();
+ private $apcuPrefix;
public function getPrefixes()
{
@@ -147,7 +148,7 @@ class ClassLoader
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
- * @param array|string $paths The PSR-0 base directories
+ * @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
@@ -271,6 +272,26 @@ class ClassLoader
return $this->classMapAuthoritative;
}
+ /**
+ * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+ *
+ * @param string|null $apcuPrefix
+ */
+ public function setApcuPrefix($apcuPrefix)
+ {
+ $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $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.
*
@@ -313,29 +334,34 @@ class ClassLoader
*/
public function findFile($class)
{
- // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
- if ('\\' == $class[0]) {
- $class = substr($class, 1);
- }
-
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
- if ($this->classMapAuthoritative) {
+ 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 ($file === null && defined('HHVM_VERSION')) {
+ if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
- if ($file === null) {
+ if (null !== $this->apcuPrefix) {
+ apcu_add($this->apcuPrefix.$class, $file);
+ }
+
+ if (false === $file) {
// Remember that this class does not exist.
- return $this->classMap[$class] = false;
+ $this->missingClasses[$class] = true;
}
return $file;
@@ -348,10 +374,14 @@ class ClassLoader
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
- foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
- if (0 === strpos($class, $prefix)) {
- foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+ $subPath = $class;
+ while (false !== $lastPos = strrpos($subPath, '\\')) {
+ $subPath = substr($subPath, 0, $lastPos);
+ $search = $subPath.'\\';
+ if (isset($this->prefixDirsPsr4[$search])) {
+ foreach ($this->prefixDirsPsr4[$search] as $dir) {
+ $length = $this->prefixLengthsPsr4[$first][$search];
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
return $file;
}
}
@@ -361,7 +391,7 @@ class ClassLoader
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
@@ -380,7 +410,7 @@ class ClassLoader
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
@@ -390,7 +420,7 @@ class ClassLoader
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
@@ -399,6 +429,8 @@ class ClassLoader
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
+
+ return false;
}
}
diff --git a/civicrm/vendor/composer/LICENSE b/civicrm/vendor/composer/LICENSE
new file mode 100644
index 0000000000..f27399a042
--- /dev/null
+++ b/civicrm/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/civicrm/vendor/composer/autoload_files.php b/civicrm/vendor/composer/autoload_files.php
index 3fbb325ef7..df6710bb44 100644
--- a/civicrm/vendor/composer/autoload_files.php
+++ b/civicrm/vendor/composer/autoload_files.php
@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
- $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
- $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
+ 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
+ '3919eeb97e98d4648304477f8ef734ba' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
);
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index ad08ffd85b..ad07789d19 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit08ca5e7ba3199d8cc11629f471bf7947
+class ComposerAutoloaderInit9a16b3f3bd333d243a82b7971a3a7c14
{
private static $loader;
@@ -19,41 +19,56 @@ class ComposerAutoloaderInit08ca5e7ba3199d8cc11629f471bf7947
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit08ca5e7ba3199d8cc11629f471bf7947', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit9a16b3f3bd333d243a82b7971a3a7c14', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit08ca5e7ba3199d8cc11629f471bf7947', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit9a16b3f3bd333d243a82b7971a3a7c14', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
- set_include_path(join(PATH_SEPARATOR, $includePaths));
+ set_include_path(implode(PATH_SEPARATOR, $includePaths));
- $map = require __DIR__ . '/autoload_namespaces.php';
- foreach ($map as $namespace => $path) {
- $loader->set($namespace, $path);
- }
+ $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+ if ($useStaticLoader) {
+ require_once __DIR__ . '/autoload_static.php';
- $map = require __DIR__ . '/autoload_psr4.php';
- foreach ($map as $namespace => $path) {
- $loader->setPsr4($namespace, $path);
- }
+ call_user_func(\Composer\Autoload\ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::getInitializer($loader));
+ } else {
+ $map = require __DIR__ . '/autoload_namespaces.php';
+ foreach ($map as $namespace => $path) {
+ $loader->set($namespace, $path);
+ }
+
+ $map = require __DIR__ . '/autoload_psr4.php';
+ foreach ($map as $namespace => $path) {
+ $loader->setPsr4($namespace, $path);
+ }
- $classMap = require __DIR__ . '/autoload_classmap.php';
- if ($classMap) {
- $loader->addClassMap($classMap);
+ $classMap = require __DIR__ . '/autoload_classmap.php';
+ if ($classMap) {
+ $loader->addClassMap($classMap);
+ }
}
$loader->register(true);
- $includeFiles = require __DIR__ . '/autoload_files.php';
- foreach ($includeFiles as $file) {
- composerRequire08ca5e7ba3199d8cc11629f471bf7947($file);
+ if ($useStaticLoader) {
+ $includeFiles = Composer\Autoload\ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::$files;
+ } else {
+ $includeFiles = require __DIR__ . '/autoload_files.php';
+ }
+ foreach ($includeFiles as $fileIdentifier => $file) {
+ composerRequire9a16b3f3bd333d243a82b7971a3a7c14($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire08ca5e7ba3199d8cc11629f471bf7947($file)
+function composerRequire9a16b3f3bd333d243a82b7971a3a7c14($fileIdentifier, $file)
{
- require $file;
+ if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+ require $file;
+
+ $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+ }
}
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
new file mode 100644
index 0000000000..c25e9c99ab
--- /dev/null
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -0,0 +1,305 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14
+{
+ public static $files = array (
+ 'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
+ '3919eeb97e98d4648304477f8ef734ba' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
+ );
+
+ public static $prefixLengthsPsr4 = array (
+ 'Z' =>
+ array (
+ 'Zend\\Validator\\' => 15,
+ 'Zend\\Stdlib\\' => 12,
+ 'Zend\\Escaper\\' => 13,
+ ),
+ 'P' =>
+ array (
+ 'PhpOffice\\PhpWord\\' => 18,
+ 'PhpOffice\\Common\\' => 17,
+ ),
+ 'D' =>
+ array (
+ 'Dompdf\\' => 7,
+ ),
+ 'C' =>
+ array (
+ 'Civi\\Cxn\\Rpc\\' => 13,
+ ),
+ );
+
+ public static $prefixDirsPsr4 = array (
+ 'Zend\\Validator\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/zendframework/zend-validator/src',
+ ),
+ 'Zend\\Stdlib\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/zendframework/zend-stdlib/src',
+ ),
+ 'Zend\\Escaper\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/zendframework/zend-escaper/src',
+ ),
+ 'PhpOffice\\PhpWord\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpoffice/phpword/src/PhpWord',
+ ),
+ 'PhpOffice\\Common\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpoffice/common/src/Common',
+ ),
+ 'Dompdf\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/dompdf/dompdf/src',
+ ),
+ 'Civi\\Cxn\\Rpc\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/civicrm/civicrm-cxn-rpc/src',
+ ),
+ );
+
+ public static $prefixesPsr0 = array (
+ 'V' =>
+ array (
+ 'Validate' =>
+ array (
+ 0 => __DIR__ . '/..' . '/pear/validate_finance_creditcard',
+ ),
+ ),
+ 'S' =>
+ array (
+ 'System' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
+ ),
+ 'Symfony\\Component\\Process\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/process',
+ ),
+ 'Symfony\\Component\\Finder\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/finder',
+ ),
+ 'Symfony\\Component\\Filesystem\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/filesystem',
+ ),
+ 'Symfony\\Component\\EventDispatcher\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
+ ),
+ 'Symfony\\Component\\DependencyInjection\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/dependency-injection',
+ ),
+ 'Symfony\\Component\\Config\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/config',
+ ),
+ 'Svg\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phenx/php-svg-lib/src',
+ ),
+ ),
+ 'P' =>
+ array (
+ 'Psr\\Log\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/psr/log',
+ ),
+ 'PHPUnit_' =>
+ array (
+ 0 => __DIR__ . '/../..' . '/packages',
+ ),
+ 'PEAR' =>
+ array (
+ 0 => __DIR__ . '/..' . '/pear/pear_exception',
+ ),
+ ),
+ 'N' =>
+ array (
+ 'Net' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
+ ),
+ ),
+ 'M' =>
+ array (
+ 'Math' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
+ ),
+ ),
+ 'F' =>
+ array (
+ 'FontLib\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phenx/php-font-lib/src',
+ ),
+ 'File' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
+ ),
+ ),
+ 'C' =>
+ array (
+ 'Crypt' =>
+ array (
+ 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
+ ),
+ 'Civi\\' =>
+ array (
+ 0 => __DIR__ . '/../..' . '/',
+ 1 => __DIR__ . '/../..' . '/tests/phpunit',
+ ),
+ 'Civi' =>
+ array (
+ 0 => __DIR__ . '/../..' . '/',
+ ),
+ 'CA_Config' =>
+ array (
+ 0 => __DIR__ . '/..' . '/totten/ca-config/src',
+ ),
+ ),
+ );
+
+ public static $classMap = array (
+ 'Cpdf' => __DIR__ . '/..' . '/dompdf/dompdf/lib/Cpdf.php',
+ 'Datamatrix' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
+ 'HTML5_Data' => __DIR__ . '/..' . '/dompdf/dompdf/lib/html5lib/Data.php',
+ 'HTML5_InputStream' => __DIR__ . '/..' . '/dompdf/dompdf/lib/html5lib/InputStream.php',
+ 'HTML5_Parser' => __DIR__ . '/..' . '/dompdf/dompdf/lib/html5lib/Parser.php',
+ 'HTML5_Tokenizer' => __DIR__ . '/..' . '/dompdf/dompdf/lib/html5lib/Tokenizer.php',
+ 'HTML5_TreeBuilder' => __DIR__ . '/..' . '/dompdf/dompdf/lib/html5lib/TreeBuilder.php',
+ 'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
+ 'PclZip' => __DIR__ . '/..' . '/pclzip/pclzip/pclzip.lib.php',
+ 'QRcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/qrcode.php',
+ 'TCPDF' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf.php',
+ 'TCPDF2DBarcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_barcodes_2d.php',
+ 'TCPDFBarcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_barcodes_1d.php',
+ 'TCPDF_COLORS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_colors.php',
+ 'TCPDF_FILTERS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_filters.php',
+ 'TCPDF_FONTS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_fonts.php',
+ 'TCPDF_FONT_DATA' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_font_data.php',
+ 'TCPDF_IMAGES' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_images.php',
+ 'TCPDF_IMPORT' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_import.php',
+ 'TCPDF_PARSER' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_parser.php',
+ 'TCPDF_STATIC' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_static.php',
+ 'ezcBase' => __DIR__ . '/..' . '/zetacomponents/base/src/base.php',
+ 'ezcBaseAutoloadException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/autoload.php',
+ 'ezcBaseAutoloadOptions' => __DIR__ . '/..' . '/zetacomponents/base/src/options/autoload.php',
+ 'ezcBaseConfigurationInitializer' => __DIR__ . '/..' . '/zetacomponents/base/src/interfaces/configuration_initializer.php',
+ 'ezcBaseDoubleClassRepositoryPrefixException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/double_class_repository_prefix.php',
+ 'ezcBaseException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/exception.php',
+ 'ezcBaseExtensionNotFoundException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/extension_not_found.php',
+ 'ezcBaseFeatures' => __DIR__ . '/..' . '/zetacomponents/base/src/features.php',
+ 'ezcBaseFile' => __DIR__ . '/..' . '/zetacomponents/base/src/file.php',
+ 'ezcBaseFileException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/file_exception.php',
+ 'ezcBaseFileFindContext' => __DIR__ . '/..' . '/zetacomponents/base/src/structs/file_find_context.php',
+ 'ezcBaseFileIoException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/file_io.php',
+ 'ezcBaseFileNotFoundException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/file_not_found.php',
+ 'ezcBaseFilePermissionException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/file_permission.php',
+ 'ezcBaseFunctionalityNotSupportedException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/functionality_not_supported.php',
+ 'ezcBaseInit' => __DIR__ . '/..' . '/zetacomponents/base/src/init.php',
+ 'ezcBaseInitCallbackConfiguredException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/init_callback_configured.php',
+ 'ezcBaseInitInvalidCallbackClassException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/invalid_callback_class.php',
+ 'ezcBaseInvalidParentClassException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/invalid_parent_class.php',
+ 'ezcBaseMetaData' => __DIR__ . '/..' . '/zetacomponents/base/src/metadata.php',
+ 'ezcBaseMetaDataPearReader' => __DIR__ . '/..' . '/zetacomponents/base/src/metadata/pear.php',
+ 'ezcBaseMetaDataTarballReader' => __DIR__ . '/..' . '/zetacomponents/base/src/metadata/tarball.php',
+ 'ezcBaseOptions' => __DIR__ . '/..' . '/zetacomponents/base/src/options.php',
+ 'ezcBasePersistable' => __DIR__ . '/..' . '/zetacomponents/base/src/interfaces/persistable.php',
+ 'ezcBasePropertyNotFoundException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/property_not_found.php',
+ 'ezcBasePropertyPermissionException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/property_permission.php',
+ 'ezcBaseRepositoryDirectory' => __DIR__ . '/..' . '/zetacomponents/base/src/structs/repository_directory.php',
+ 'ezcBaseSettingNotFoundException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/setting_not_found.php',
+ 'ezcBaseSettingValueException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/setting_value.php',
+ 'ezcBaseStruct' => __DIR__ . '/..' . '/zetacomponents/base/src/struct.php',
+ 'ezcBaseValueException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/value.php',
+ 'ezcBaseWhateverException' => __DIR__ . '/..' . '/zetacomponents/base/src/exceptions/whatever.php',
+ 'ezcMail' => __DIR__ . '/..' . '/zetacomponents/mail/src/mail.php',
+ 'ezcMailAddress' => __DIR__ . '/..' . '/zetacomponents/mail/src/structs/mail_address.php',
+ 'ezcMailCharsetConverter' => __DIR__ . '/..' . '/zetacomponents/mail/src/internal/charset_convert.php',
+ 'ezcMailComposer' => __DIR__ . '/..' . '/zetacomponents/mail/src/composer.php',
+ 'ezcMailComposerOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/composer_options.php',
+ 'ezcMailContentDispositionHeader' => __DIR__ . '/..' . '/zetacomponents/mail/src/structs/content_disposition_header.php',
+ 'ezcMailDeliveryStatus' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/delivery_status.php',
+ 'ezcMailDeliveryStatusParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/delivery_status_parser.php',
+ 'ezcMailException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/mail_exception.php',
+ 'ezcMailFile' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/fileparts/disk_file.php',
+ 'ezcMailFileParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/file_parser.php',
+ 'ezcMailFilePart' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/file.php',
+ 'ezcMailFileSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/file/file_set.php',
+ 'ezcMailHeaderFolder' => __DIR__ . '/..' . '/zetacomponents/mail/src/internal/header_folder.php',
+ 'ezcMailHeadersHolder' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/headers_holder.php',
+ 'ezcMailImapSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/imap/imap_set.php',
+ 'ezcMailImapSetOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/imap_set_options.php',
+ 'ezcMailImapTransport' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/imap/imap_transport.php',
+ 'ezcMailImapTransportOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/imap_options.php',
+ 'ezcMailInvalidLimitException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/invalid_limit.php',
+ 'ezcMailMboxSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/mbox/mbox_set.php',
+ 'ezcMailMboxTransport' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/mbox/mbox_transport.php',
+ 'ezcMailMtaTransport' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/mta/mta_transport.php',
+ 'ezcMailMultipart' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multipart.php',
+ 'ezcMailMultipartAlternative' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multiparts/multipart_alternative.php',
+ 'ezcMailMultipartAlternativeParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_alternative_parser.php',
+ 'ezcMailMultipartDigest' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multiparts/multipart_digest.php',
+ 'ezcMailMultipartDigestParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_digest_parser.php',
+ 'ezcMailMultipartMixed' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multiparts/multipart_mixed.php',
+ 'ezcMailMultipartMixedParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_mixed_parser.php',
+ 'ezcMailMultipartParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_parser.php',
+ 'ezcMailMultipartRelated' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multiparts/multipart_related.php',
+ 'ezcMailMultipartRelatedParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_related_parser.php',
+ 'ezcMailMultipartReport' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/multiparts/multipart_report.php',
+ 'ezcMailMultipartReportParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/multipart_report_parser.php',
+ 'ezcMailNoSuchMessageException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/no_such_message.php',
+ 'ezcMailOffsetOutOfRangeException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/offset_out_of_range.php',
+ 'ezcMailParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parser.php',
+ 'ezcMailParserOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/parser_options.php',
+ 'ezcMailParserSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/interfaces/parser_set.php',
+ 'ezcMailParserShutdownHandler' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/shutdown_handler.php',
+ 'ezcMailPart' => __DIR__ . '/..' . '/zetacomponents/mail/src/interfaces/part.php',
+ 'ezcMailPartParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/interfaces/part_parser.php',
+ 'ezcMailPartWalkContext' => __DIR__ . '/..' . '/zetacomponents/mail/src/structs/walk_context.php',
+ 'ezcMailPop3Set' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/pop3/pop3_set.php',
+ 'ezcMailPop3Transport' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/pop3/pop3_transport.php',
+ 'ezcMailPop3TransportOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/pop3_options.php',
+ 'ezcMailRfc2231Implementation' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/rfc2231_implementation.php',
+ 'ezcMailRfc822Digest' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/rfc822_digest.php',
+ 'ezcMailRfc822DigestParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/rfc822_digest_parser.php',
+ 'ezcMailRfc822Parser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/rfc822_parser.php',
+ 'ezcMailSmtpTransport' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/smtp/smtp_transport.php',
+ 'ezcMailSmtpTransportOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/smtp_options.php',
+ 'ezcMailStorageSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/storage/storage_set.php',
+ 'ezcMailStreamFile' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/fileparts/stream_file.php',
+ 'ezcMailText' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/text.php',
+ 'ezcMailTextParser' => __DIR__ . '/..' . '/zetacomponents/mail/src/parser/parts/text_parser.php',
+ 'ezcMailTools' => __DIR__ . '/..' . '/zetacomponents/mail/src/tools.php',
+ 'ezcMailTransport' => __DIR__ . '/..' . '/zetacomponents/mail/src/interfaces/transport.php',
+ 'ezcMailTransportConnection' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/transport_connection.php',
+ 'ezcMailTransportException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/transport_exception.php',
+ 'ezcMailTransportMta' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/mta/transport_mta.php',
+ 'ezcMailTransportOptions' => __DIR__ . '/..' . '/zetacomponents/mail/src/options/transport_options.php',
+ 'ezcMailTransportSmtp' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/smtp/transport_smtp.php',
+ 'ezcMailTransportSmtpException' => __DIR__ . '/..' . '/zetacomponents/mail/src/exceptions/transport_smtp_exception.php',
+ 'ezcMailVariableSet' => __DIR__ . '/..' . '/zetacomponents/mail/src/transports/variable/var_set.php',
+ 'ezcMailVirtualFile' => __DIR__ . '/..' . '/zetacomponents/mail/src/parts/fileparts/virtual_file.php',
+ );
+
+ public static function getInitializer(ClassLoader $loader)
+ {
+ return \Closure::bind(function () use ($loader) {
+ $loader->prefixLengthsPsr4 = ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInit9a16b3f3bd333d243a82b7971a3a7c14::$classMap;
+
+ }, null, ClassLoader::class);
+ }
+}
diff --git a/civicrm/vendor/composer/installed.json b/civicrm/vendor/composer/installed.json
index 5f592651f4..f17847d73d 100644
--- a/civicrm/vendor/composer/installed.json
+++ b/civicrm/vendor/composer/installed.json
@@ -14,7 +14,7 @@
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
"shasum": ""
},
- "time": "2012-12-21 11:40:51",
+ "time": "2012-12-21T11:40:51+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -68,7 +68,7 @@
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
"pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 5.0.0."
},
- "time": "2016-10-22 17:53:16",
+ "time": "2016-10-22T17:53:16+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -162,7 +162,7 @@
"require-dev": {
"phpunit/phpunit": "3.7.*"
},
- "time": "2016-12-06 04:32:51",
+ "time": "2016-12-06T04:32:51+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -197,7 +197,7 @@
"reference": "b419766515b3426c6da74b0e29e93d71c4f17099",
"shasum": ""
},
- "time": "2015-05-06 18:49:49",
+ "time": "2015-05-06T18:49:49+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -233,7 +233,7 @@
"reference": "b8af0cacdc3cbf1e41a586fcb78f506f4121a088",
"shasum": ""
},
- "time": "2015-05-06 20:02:39",
+ "time": "2015-05-06T20:02:39+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -280,7 +280,7 @@
"require-dev": {
"phpunit/phpunit": "3.7.*"
},
- "time": "2016-05-11 00:36:29",
+ "time": "2016-05-11T00:36:29+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -332,7 +332,7 @@
"reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
"shasum": ""
},
- "time": "2014-06-05 11:42:24",
+ "time": "2014-06-05T11:42:24+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -377,7 +377,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2015-02-10 20:07:52",
+ "time": "2015-02-10T20:07:52+00:00",
"type": "class",
"extra": {
"branch-alias": {
@@ -435,7 +435,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2016-09-12 08:01:21",
+ "time": "2016-09-12T08:01:21+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -492,7 +492,7 @@
"zendframework/zend-serializer": "Zend\\Serializer component",
"zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
},
- "time": "2015-07-21 13:55:46",
+ "time": "2015-07-21T13:55:46+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -558,7 +558,7 @@
"zendframework/zend-session": "Zend\\Session component",
"zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
},
- "time": "2015-09-08 21:04:17",
+ "time": "2015-09-08T21:04:17+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -606,7 +606,7 @@
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "dev-master"
},
- "time": "2015-05-07 14:55:31",
+ "time": "2015-05-07T14:55:31+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -657,7 +657,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
- "time": "2016-07-07 17:26:55",
+ "time": "2016-07-07T17:26:55+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -727,7 +727,7 @@
"ext-xsl": "Allows applying XSL style sheet to headers, to main document part, and to footers of an OOXML template",
"ext-zip": "Allows writing OOXML and ODF"
},
- "time": "2016-07-31 08:53:39",
+ "time": "2016-07-31T08:53:39+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -808,7 +808,7 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2015-01-03 21:04:44",
+ "time": "2015-01-03T21:04:44+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -858,7 +858,7 @@
"php": ">=5.3.3",
"symfony/filesystem": "~2.3"
},
- "time": "2015-01-03 08:01:13",
+ "time": "2015-01-03T08:01:13+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -917,7 +917,7 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": ""
},
- "time": "2015-01-25 04:37:39",
+ "time": "2015-01-25T04:37:39+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -976,7 +976,7 @@
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
- "time": "2015-01-29 18:20:43",
+ "time": "2015-01-29T18:20:43+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1025,7 +1025,7 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2015-01-03 08:01:13",
+ "time": "2015-01-03T08:01:13+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1074,7 +1074,7 @@
"require": {
"php": ">=5.3.3"
},
- "time": "2015-02-08 07:07:45",
+ "time": "2015-02-08T07:07:45+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1122,7 +1122,7 @@
"require": {
"php": ">=5.3.0"
},
- "time": "2015-09-12 10:08:34",
+ "time": "2015-09-12T10:08:34+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1187,7 +1187,7 @@
"require": {
"php": ">=5.2"
},
- "time": "2013-02-13 03:40:18",
+ "time": "2013-02-13T03:40:18+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1223,7 +1223,7 @@
"reference": "2612ee3ce88902632d45b93e379277e9d46b70a7",
"shasum": ""
},
- "time": "2009-06-29 10:47:39",
+ "time": "2009-06-29T10:47:39+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1277,9 +1277,9 @@
"source": {
"type": "git",
"url": "https://github.com/civicrm/zetacomponents-mail.git",
- "reference": "19f5af66cdde19bc20f41671fe453b37f4121eb1"
+ "reference": "e0feff0e1860f16fa2b3c42795c0351db58120a0"
},
- "time": "2016-01-08 01:15:38",
+ "time": "2017-03-14T06:51:24+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
diff --git a/civicrm/vendor/zetacomponents/mail/src/transports/file/file_set.php b/civicrm/vendor/zetacomponents/mail/src/transports/file/file_set.php
index 1c675fdfb5..1fc29afc0f 100644
--- a/civicrm/vendor/zetacomponents/mail/src/transports/file/file_set.php
+++ b/civicrm/vendor/zetacomponents/mail/src/transports/file/file_set.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding="latin1");
-
/**
* File containing the ezcMailFileSet class
*
diff --git a/civicrm/vendor/zetacomponents/mail/src/transports/variable/var_set.php b/civicrm/vendor/zetacomponents/mail/src/transports/variable/var_set.php
index c5c33f56f4..db00c46752 100644
--- a/civicrm/vendor/zetacomponents/mail/src/transports/variable/var_set.php
+++ b/civicrm/vendor/zetacomponents/mail/src/transports/variable/var_set.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding="latin1");
-
/**
* File containing the ezcMailVariableSet class
*
diff --git a/includes/civicrm.basepage.php b/includes/civicrm.basepage.php
index cc7f16b382..4559e38f4b 100644
--- a/includes/civicrm.basepage.php
+++ b/includes/civicrm.basepage.php
@@ -76,6 +76,15 @@ class CiviCRM_For_WordPress_Basepage {
return;
}
+ // In WP 4.6.0+, tell it URL params are part of canonical URL
+ add_filter( 'get_canonical_url', array( $this, 'basepage_canonical_url' ), 999 );
+
+ // Yoast SEO has separate way of establishing canonical URL
+ add_filter( 'wpseo_canonical', array( $this, 'basepage_canonical_url' ), 999 );
+
+ // And also for All in One SEO to handle canonical URL
+ add_filter( 'aioseop_canonical_url', array( $this, 'basepage_canonical_url' ), 999 );
+
// regardless of URL, load page template
add_filter( 'template_include', array( $this, 'basepage_template' ), 999 );
@@ -178,6 +187,9 @@ class CiviCRM_For_WordPress_Basepage {
// tweak admin bar
add_action( 'wp_before_admin_bar_render', array( $this->civi, 'clear_edit_post_menu_item' ) );
+ // add body classes for easier styling
+ add_filter( 'body_class', array( $this, 'add_body_classes' ) );
+
// flag that we have parsed the base page
$this->basepage_parsed = TRUE;
@@ -259,6 +271,45 @@ class CiviCRM_For_WordPress_Basepage {
}
+ /**
+ * Provide the canonical URL for a page accessed through a basepage.
+ *
+ * WordPress will default to saying the canonical URL is the URL of the base
+ * page itself, but we need to indicate that in this case, the whole thing
+ * matters.
+ *
+ * Note: this function is used for three different but similar hooks:
+ * - `get_canonical_url` (WP 4.6.0+)
+ * - `aioseop_canonical_url` (All in One SEO)
+ * - `wpseo_canonical` (Yoast WordPress SEO)
+ *
+ * The native WordPress one passes the page object, while the other two do
+ * not. We don't actually need the page object, so the argument is omitted
+ * here.
+ *
+ * @param string $canonical
+ * The canonical URL.
+ *
+ * @return string
+ * The complete URL to the page as it should be accessed.
+ */
+ public function basepage_canonical_url( $canonical ) {
+ // It would be better to specify which params are okay to accept as the
+ // canonical URLs, but this will work for the time being.
+ if ( empty( $_GET['page'] )
+ || empty( $_GET['q'] )
+ || 'CiviCRM' !== $_GET['page'] ) {
+ return $canonical;
+ }
+ $path = $_GET['q'];
+ unset( $_GET['q'] );
+ unset( $_GET['page'] );
+ $query = http_build_query( $_GET );
+
+ // We should, however, build the URL the way that CiviCRM expects it to be
+ // (rather than through some other funny base page).
+ return CRM_Utils_System::url( $path, $query );
+ }
/**
* Get CiviCRM base page template.
@@ -327,6 +378,47 @@ class CiviCRM_For_WordPress_Basepage {
}
-} // class CiviCRM_For_WordPress_Basepage ends
+ /**
+ * Add classes to body element when on basepage.
+ *
+ * This allows selectors to be written for particular CiviCRM "pages" despite
+ * them all being rendered on the one WordPress basepage.
+ *
+ * @param array $classes The existing body classes
+ * @return array $classes The modified body classes
+ */
+ public function add_body_classes( $classes ) {
+
+ $args = $this->civi->get_request_args();
+
+ // bail if we don't have any
+ if ( is_null( $args['argString'] ) ) {
+ return $classes;
+ }
+
+ // check for top level - it can be assumed this always 'civicrm'
+ if ( isset( $args['args'][0] ) AND ! empty( $args['args'][0] ) ) {
+ $classes[] = $args['args'][0];
+ }
+ // check for second level - the component
+ if ( isset( $args['args'][1] ) AND ! empty( $args['args'][1] ) ) {
+ $classes[] = $args['args'][0] . '-' . $args['args'][1];
+ }
+ // check for third level - the component's configuration
+ if ( isset( $args['args'][2] ) AND ! empty( $args['args'][2] ) ) {
+ $classes[] = $args['args'][0] . '-' . $args['args'][1] . '-' . $args['args'][2];
+ }
+
+ // check for fourth level - because well, why not?
+ if ( isset( $args['args'][3] ) AND ! empty( $args['args'][3] ) ) {
+ $classes[] = $args['args'][0] . '-' . $args['args'][1] . '-' . $args['args'][2] . '-' . $args['args'][3];
+ }
+
+ return $classes;
+
+ }
+
+
+} // class CiviCRM_For_WordPress_Basepage ends
--
GitLab