Skip to content

Just a bit of cleanup #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eileenmcnaughton wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Just a bit of cleanup #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
98ccff1
Test cleanup fix
eileenmcnaughton Feb 18, 2021
8c90564
See https://github.com/civicrm/civicrm-core/pull/23504
eileenmcnaughton May 19, 2022
e25a1dc
Run civix.update on EmailAmender
eileenmcnaughton Sep 22, 2022
c5d83aa
Remove trailing space
eileenmcnaughton Sep 22, 2022
c7528a5
Remove import tests - the import code being called directly in the te…
eileenmcnaughton Sep 22, 2022
d02960e
Do not show as user-creatable action
eileenmcnaughton Mar 7, 2023
f23453f
Civix upgrade
eileenmcnaughton Mar 7, 2023
359dfd4
Civix update
eileenmcnaughton Sep 25, 2023
d8dda61
Increment version
eileenmcnaughton Sep 25, 2023
7ba63a5
Increment version
eileenmcnaughton Sep 25, 2023
eca6df0
Improve translation usage
eileenmcnaughton Oct 25, 2023
7a00ea2
Move Navigation & Activity Type to managed entities
eileenmcnaughton Oct 25, 2023
114467b
Add Amend permission
eileenmcnaughton Oct 25, 2023
d7d8192
Increment Civi version to tested version
eileenmcnaughton Oct 25, 2023
38e7127
Remove mixin to reflect version increment
eileenmcnaughton Oct 25, 2023
211c06b
Add new administer_email_amender permission, suppress form editing if…
eileenmcnaughton Oct 26, 2023
aa2cc27
Rename text version of permission
eileenmcnaughton Oct 26, 2023
97212f7
Fix settings template for Smarty 3
ejegg Feb 21, 2024
b254ad9
Merge pull request #1 from ejegg/Smarty3
eileenmcnaughton Feb 21, 2024
004bc49
update permissions hook from deprecated format
eileenmcnaughton May 3, 2024
00cb387
Fix extensions + a trailing space
eileenmcnaughton Sep 19, 2024
0bbf0e8
Fix a couple more exceptions
eileenmcnaughton Sep 19, 2024
11a308a
update to CiviCRM jQuery to work with standalone
larssandergreen Aug 27, 2025
09bd70f
Merge pull request #2 from larssandergreen/update_jQuery
eileenmcnaughton Sep 2, 2025
f6e6f61
Minor test updates
eileenmcnaughton Sep 2, 2025
4512ea5
Civix upgrade
eileenmcnaughton Sep 2, 2025
e3bfb01
Civix upgrade, increment version
eileenmcnaughton Sep 2, 2025
a508c0c
info.xml fixeS
eileenmcnaughton Oct 5, 2025
9c6811f
Update info.xml
eileenmcnaughton Oct 6, 2025
226ee9f
Update info.xml
eileenmcnaughton Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CRM/Emailamender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function is_autocorrect_enabled() {
*
* @return bool correction took place
*
* @throws \CiviCRM_API3_Exception
* @throws \CRM_Core_Exception
*/
public function fixEmailAddress($iEmailId, $iContactId, $sRawEmail) {

Expand Down Expand Up @@ -136,7 +136,7 @@ public function fixEmailAddress($iEmailId, $iContactId, $sRawEmail) {
// Recalculate display name.
civicrm_api3('Contact', 'create', ['id' => $iContactId]);
}
catch (CiviCRM_API3_Exception $e) {
catch (CRM_Core_Exception $e) {
CRM_Core_Session::setStatus(ts("Error when correcting email - contact ID $iContactId"), ts('Email Address Corrector'), 'error');
throw $e;
}
Expand Down
3 changes: 2 additions & 1 deletion CRM/Emailamender/Page/EmailAmenderSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ function run() {
$this->assign('compound_top_level_domains', Civi::settings()->get('emailamender.compound_top_level_domains'));

$this->assign('equivalent_domain_settings', Civi::settings()->get('emailamender.equivalent_domains'));

$this->assign('hasEditPermission', CRM_Core_Permission::check('administer_email_amender'));
$this->assign('hasEnablePermission', CRM_Core_Permission::check('administer CiviCRM'));
parent::run();
}
}
2 changes: 1 addition & 1 deletion CRM/Emailamender/Upgrader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Collection of upgrade steps
*/
class CRM_Emailamender_Upgrader extends CRM_Emailamender_Upgrader_Base {
class CRM_Emailamender_Upgrader extends CRM_Extension_Upgrader_Base {

// By convention, functions that look like "function upgrade_NNNN()" are
// upgrade tasks. They are executed in order (like Drupal's hook_update_N).
Expand Down
298 changes: 0 additions & 298 deletions CRM/Emailamender/Upgrader/Base.php
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions Managed/ActivityType.mgd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

use CRM_Emailamender_ExtensionUtil as E;

return [
[
'name' => 'ActivityType - corrected_email_address',
'entity' => 'OptionValue',
'cleanup' => 'unused',
'update' => 'unmodified',
'params' => [
'version' => 4,
'match' => ['option_group_id', 'name'],
'values' => [
'label' => E::ts('Corrected Email Address'),
'name' => 'corrected_email_address',
'description' => 'Automatically corrected emails (by the Email Address Corrector extension).',
'option_group_id:name' => 'activity_type',
'filter' => 1,
],
],
],
];
34 changes: 34 additions & 0 deletions Managed/Navigation.mgd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

use Civi\Api4\Domain;
use CRM_Emailamender_ExtensionUtil as E;

$menuItems = [];
$domains = Domain::get(FALSE)
->addSelect('id')
->execute();
foreach ($domains as $domain) {
$menuItems[] = [
'name' => 'EmailAmenderSettings',
'entity' => 'Navigation',
'cleanup' => 'always',
'update' => 'unmodified',
'params' => [
'version' => 4,
'values' => [
'label' => E::ts('Email Address Corrector Settings'),
'name' => 'EmailAmenderSettings',
'url' => 'civicrm/emailamendersettings',
'permission' => NULL,
'permission_operator' => 'OR',
'parent_id.name' => 'System Settings',
'is_active' => TRUE,
'has_separator' => 2,
'weight' => 15,
'domain_id' => $domain['id'],
],
'match' => ['domain_id', 'name'],
],
];
}
return $menuItems;
Loading