forked from civicrm/civicrm-core
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CATL-1614: Add new field to the mail account form - Do not create new…
… contacts when filing emails
- Loading branch information
Showing
7 changed files
with
293 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| <?php | ||
| /* | ||
| +--------------------------------------------------------------------+ | ||
| | Copyright CiviCRM LLC. All rights reserved. | | ||
| | | | ||
| | This work is published under the GNU AGPLv3 license with some | | ||
| | permitted exceptions and without any warranty. For full license | | ||
| | and copyright information, see https://civicrm.org/licensing | | ||
| +--------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| /** | ||
| * Upgrade logic for FiveThirtyOne */ | ||
| class CRM_Upgrade_Incremental_php_FiveThirtyOne extends CRM_Upgrade_Incremental_Base { | ||
|
|
||
| /** | ||
| * Compute any messages which should be displayed beforeupgrade. | ||
| * | ||
| * Note: This function is called iteratively for each upcoming | ||
| * revision to the database. | ||
| * | ||
| * @param string $preUpgradeMessage | ||
| * @param string $rev | ||
| * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. | ||
| * @param null $currentVer | ||
| */ | ||
| public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { | ||
| // Example: Generate a pre-upgrade message. | ||
| // if ($rev == '5.12.34') { | ||
| // $preUpgradeMessage .= '<p>' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '</p>'; | ||
| // } | ||
| } | ||
|
|
||
| /** | ||
| * Compute any messages which should be displayed after upgrade. | ||
| * | ||
| * @param string $postUpgradeMessage | ||
| * alterable. | ||
| * @param string $rev | ||
| * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. | ||
| */ | ||
| public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { | ||
| // Example: Generate a post-upgrade message. | ||
| // if ($rev == '5.12.34') { | ||
| // $postUpgradeMessage .= '<br /><br />' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); | ||
| // } | ||
| } | ||
|
|
||
| /* | ||
| * Important! All upgrade functions MUST add a 'runSql' task. | ||
| * Uncomment and use the following template for a new upgrade version | ||
| * (change the x in the function name): | ||
| */ | ||
|
|
||
| /** | ||
| * Upgrade function. | ||
| * | ||
| * @param string $rev | ||
| */ | ||
| public function upgrade_5_31_alpha1($rev) { | ||
| $this->addTask('Expand internal civicrm group title field to be 255 in length', 'grouptitlefieldExpand'); | ||
| $this->addTask('Add in optional public title group table', 'addColumn', 'civicrm_group', 'frontend_title', "varchar(255) DEFAULT NULL COMMENT 'Alternative public title for this Group.'", TRUE, '5.31.alpha1', FALSE); | ||
| $this->addTask('Add in optional public description group table', 'addColumn', 'civicrm_group', 'frontend_description', "text DEFAULT NULL COMMENT 'Alternative public description of the group.'", TRUE, '5.31.alpha1'); | ||
| $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); | ||
| $this->addTask('Remove Eway Single Currency Payment Processor type if not used or install the new extension for it', 'enableEwaySingleExtension'); | ||
| $this->addTask('dev/core#1486 Remove FKs from ACL Cache tables', 'removeFKsFromACLCacheTables'); | ||
| $this->addTask('Activate core extension "Greenwich"', 'installGreenwich'); | ||
| } | ||
|
|
||
| /** | ||
| * Upgrade function. | ||
| * | ||
| * @param string $rev | ||
| */ | ||
| public function upgrade_5_31_0($rev) { | ||
| $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); | ||
| $this->addTask('Add is_contact_creation_disabled_if_no_match column to civicrm_mail_settings', 'addColumn', | ||
| 'civicrm_mail_settings', 'is_contact_creation_disabled_if_no_match', "TINYINT DEFAULT 0 NOT NULL COMMENT 'If this option is enabled, CiviCRM will not create new contacts when filing emails'"); | ||
| } | ||
|
|
||
| public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) { | ||
| $eWAYPaymentProcessorType = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_payment_processor_type WHERE class_name = 'Payment_eWAY'"); | ||
| if ($eWAYPaymentProcessorType) { | ||
| $ewayPaymentProcessorCount = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_payment_processor WHERE payment_processor_type_id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]); | ||
| if ($ewayPaymentProcessorCount) { | ||
| $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([ | ||
| 'type' => 'module', | ||
| 'full_name' => 'ewaysingle', | ||
| 'name' => 'eway Single currency extension', | ||
| 'label' => 'eway Single currency extension', | ||
| 'file' => 'ewaysingle', | ||
| 'schema_version' => NULL, | ||
| 'is_active' => 1, | ||
| ]); | ||
| CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL()); | ||
| $managedEntity = CRM_Utils_SQL_Insert::into('civicrm_managed')->row([ | ||
| 'name' => 'eWAY', | ||
| 'module' => 'ewaysingle', | ||
| 'entity_type' => 'PaymentProcessorType', | ||
| 'entity_id' => $eWAYPaymentProcessorType, | ||
| 'cleanup' => NULL, | ||
| ]); | ||
| CRM_Core_DAO::executeQuery($managedEntity->usingReplace()->toSQL()); | ||
| } | ||
| else { | ||
| CRM_Core_DAO::executeQuery("DELETE FROM civicrm_payment_processor_type WHERE id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]); | ||
| } | ||
| } | ||
| return TRUE; | ||
| } | ||
|
|
||
| public static function removeFKsFromACLCacheTables(CRM_Queue_TaskContext $ctx) { | ||
| CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_acl_contact_cache', 'FK_civicrm_acl_contact_cache_contact_id'); | ||
| CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_acl_cache', 'FK_civicrm_acl_cache_contact_id'); | ||
| CRM_Core_BAO_SchemaHandler::createIndexes(['civicrm_acl_cache' => ['contact_id']]); | ||
| return TRUE; | ||
| } | ||
|
|
||
| /** | ||
| * Install greenwich extensions. | ||
| * | ||
| * This feature is restructured as a core extension - which is primarily a code cleanup step. | ||
| * | ||
| * @param \CRM_Queue_TaskContext $ctx | ||
| * | ||
| * @return bool | ||
| * | ||
| * @throws \CRM_Core_Exception | ||
| */ | ||
| public static function installGreenwich(CRM_Queue_TaskContext $ctx) { | ||
| // Install via direct SQL manipulation. Note that: | ||
| // (1) This extension has no activation logic. | ||
| // (2) On new installs, the extension is activated purely via default SQL INSERT. | ||
| // (3) Caches are flushed at the end of the upgrade. | ||
| // ($) Over long term, upgrade steps are more reliable in SQL. API/BAO sometimes don't work mid-upgrade. | ||
| $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([ | ||
| 'type' => 'module', | ||
| 'full_name' => 'greenwich', | ||
| 'name' => 'Theme: Greenwich', | ||
| 'label' => 'Theme: Greenwich', | ||
| 'file' => 'greenwich', | ||
| 'schema_version' => NULL, | ||
| 'is_active' => 1, | ||
| ]); | ||
| CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL()); | ||
|
|
||
| return TRUE; | ||
| } | ||
|
|
||
| /** | ||
| * Expands the length of the civicrm_group.title field in the database to be 255. | ||
| * | ||
| * @param \CRM_Queue_TaskContext $ctx | ||
| * | ||
| * @return bool | ||
| */ | ||
| public static function grouptitlefieldExpand(CRM_Queue_TaskContext $ctx) { | ||
| $locales = CRM_Core_I18n::getMultilingual(); | ||
| $queries = []; | ||
| if ($locales) { | ||
| foreach ($locales as $locale) { | ||
| $queries[] = "ALTER TABLE civicrm_group CHANGE `title_{$locale}` `title_{$locale}` varchar(255) NOT NULL COMMENT 'Name of Group.'"; | ||
| } | ||
| } | ||
| else { | ||
| $queries[] = "ALTER TABLE civicrm_group CHANGE `title` `title` varchar(255) NOT NULL COMMENT 'Name of Group.'"; | ||
| } | ||
| foreach ($queries as $query) { | ||
| CRM_Core_DAO::executeQuery($query, [], TRUE, NULL, FALSE, FALSE); | ||
| } | ||
| return TRUE; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.