Below is a differential between the unpatched vulnerable code and the patched update, for reference.
--- a/acymailing/back/Classes/ActionClass.php
+++ b/acymailing/back/Classes/ActionClass.php
@@ -116,7 +116,7 @@
ON `action`.`condition_id` = `condition`.`id`
JOIN `#__acym_step` AS `step`
ON `condition`.`step_id` = `step`.`id`
- WHERE `step`.`automation_id` = '.$id
+ WHERE `step`.`automation_id` = '.intval($id)
);
array_map([$this, 'fixTypes'], $actions);
--- a/acymailing/back/Classes/CampaignClass.php
+++ b/acymailing/back/Classes/CampaignClass.php
@@ -97,6 +97,7 @@
$listClass = new ListClass();
$allowedLists = $listClass->getManageableLists();
if (!empty($allowedLists)) {
+ acym_arrayToInteger($allowedLists);
$query .= ' LEFT JOIN #__acym_mail_has_list AS mailList ON campaign.mail_id = mailList.mail_id AND mailList.list_id IN ('.implode(',', $allowedLists).')';
$queryCount .= ' LEFT JOIN #__acym_mail_has_list AS mailList ON campaign.mail_id = mailList.mail_id AND mailList.list_id IN ('.implode(',', $allowedLists).')';
$condition .= ' OR mailList.list_id IS NOT NULL';
--- a/acymailing/back/Classes/FieldClass.php
+++ b/acymailing/back/Classes/FieldClass.php
@@ -130,9 +130,11 @@
{
$query = 'SELECT '.acym_secureDBColumn($fieldDB->value).' AS value, '.acym_secureDBColumn($fieldDB->title).' AS title
FROM `'.acym_secureDBColumn($fieldDB->database).'`.`'.acym_secureDBColumn($fieldDB->table).'`';
- $query .= isset($fieldDB->where_value) && strlen($fieldDB->where_value) > 0 ? ' WHERE `'.acym_secureDBColumn($fieldDB->where).'` '.$fieldDB->where_sign.' '.acym_escapeDB(
- $fieldDB->where_value
- ) : '';
+ if (isset($fieldDB->where_value) && strlen($fieldDB->where_value) > 0) {
+ $allowedSigns = ['=', '!=', '>', '<', '>=', '<=', 'BEGINS', 'END', 'CONTAINS', 'NOTCONTAINS', 'LIKE', 'NOT LIKE', 'REGEXP', 'NOT REGEXP', 'IS NULL', 'IS NOT NULL'];
+ $whereSign = in_array($fieldDB->where_sign ?? '', $allowedSigns, true) ? $fieldDB->where_sign : '=';
+ $query .= ' WHERE `'.acym_secureDBColumn($fieldDB->where).'` '.$whereSign.' '.acym_escapeDB($fieldDB->where_value);
+ }
if (!empty($fieldDB->order_by)) $query .= ' ORDER BY '.acym_secureDBColumn($fieldDB->order_by).' '.acym_secureDBColumn($fieldDB->sort_order);
return acym_loadObjectList($query);
--- a/acymailing/back/Classes/FollowupClass.php
+++ b/acymailing/back/Classes/FollowupClass.php
@@ -571,7 +571,13 @@
$triggers = [];
acym_trigger('onAcymGetFollowupDailyBases', [&$triggers]);
- return acym_loadObjectList('SELECT * FROM #__acym_followup WHERE `trigger` IN ("'.implode('","', $triggers).'") AND active = 1');
+ if (empty($triggers)) {
+ return [];
+ }
+
+ $safeTriggers = array_map('acym_escapeDB', $triggers);
+
+ return acym_loadObjectList('SELECT * FROM #__acym_followup WHERE `trigger` IN ('.implode(',', $safeTriggers).') AND active = 1');
}
public function queueForSubscribers(int $emailId): bool
--- a/acymailing/back/Classes/ListClass.php
+++ b/acymailing/back/Classes/ListClass.php
@@ -30,7 +30,7 @@
unset($settings['columns'][$key]);
continue;
}
- $settings['columns'][$key] = $key === 'join' ? $value : 'list.'.$value;
+ $settings['columns'][$key] = $key === 'join' ? acym_secureDBColumn($value) : 'list.'.acym_secureDBColumn($value);
}
$columns = implode(', ', $settings['columns']);
}
--- a/acymailing/back/Classes/MailClass.php
+++ b/acymailing/back/Classes/MailClass.php
@@ -157,9 +157,14 @@
}
if (!empty($settings['element_tab'])) {
- $statJoin = ' LEFT JOIN #__acym_mail_stat AS mail_stat ON mail.id = mail_stat.mail_id ';
- $listJoin = acym_isAdmin() ? '' : ' LEFT JOIN #__acym_list AS list ON list.'.acym_escape($settings['element_tab']).'_id = mail.id';
- $query = 'SELECT DISTINCT mail.*, mail_stat.sent as subscribers, mail_stat.open_unique FROM #__acym_mail AS mail'.$statJoin.$tagJoin.$listJoin;
+ $query = 'SELECT DISTINCT mail.*, mail_stat.sent as subscribers, mail_stat.open_unique FROM #__acym_mail AS mail';
+ $query .= ' LEFT JOIN #__acym_mail_stat AS mail_stat ON mail.id = mail_stat.mail_id ';
+ if (!empty($settings['tag'])) {
+ $query .= ' JOIN #__acym_tag AS tag ON mail.id = tag.id_element ';
+ }
+ if (!acym_isAdmin()) {
+ $query .= ' LEFT JOIN #__acym_list AS list ON list.'.acym_secureDBColumn($settings['element_tab']).'_id = mail.id';
+ }
$filters[] = 'mail.type = '.acym_escapeDB($settings['element_tab']);
}
--- a/acymailing/back/Classes/UserClass.php
+++ b/acymailing/back/Classes/UserClass.php
@@ -59,7 +59,7 @@
$columns = '`user`.*';
if (!empty($settings['columns'])) {
foreach ($settings['columns'] as $key => $value) {
- $settings['columns'][$key] = $key === 'join' ? $value : 'user.'.$value;
+ $settings['columns'][$key] = $key === 'join' ? acym_secureDBColumn($value) : 'user.'.acym_secureDBColumn($value);
}
$columns = implode(', ', $settings['columns']);
}
@@ -459,6 +459,7 @@
public function getUsersSubscriptionsByIds(array $userIds, int $creatorId = 0): array
{
+ acym_arrayToInteger($userIds);
$query = 'SELECT `list`.`id`, `list`.`color`, `list`.`name`, `userlist`.`user_id`, `userlist`.`status`
FROM #__acym_list AS `list`
JOIN #__acym_user_has_list AS `userlist`
@@ -468,8 +469,12 @@
if (!empty($creatorId)) {
$userGroups = acym_getGroupsByUser($creatorId);
- $groupCondition = '`list`.`access` LIKE "%,'.implode(',%" OR `list`.`access` LIKE "%,', $userGroups).',%"';
- $query .= ' AND (`list`.`cms_user_id` = '.intval($creatorId).' OR '.$groupCondition.')';
+
+ $safeGroups = [];
+ foreach ($userGroups as $group) {
+ $safeGroups[] = acym_escapeDB('%,'.$group.',%');
+ }
+ $query .= ' AND (`list`.`cms_user_id` = '.intval($creatorId).' OR `list`.`access` LIKE '.implode(' OR `list`.`access` LIKE ', $safeGroups).')';
}
$query .= ' ORDER BY `userlist`.`status` DESC, `list`.`id` ASC';
@@ -540,10 +545,12 @@
if (empty($addLists)) {
return false;
}
+ acym_arrayToInteger($addLists);
if (!is_array($userIds)) {
$userIds = [$userIds];
}
+ acym_arrayToInteger($userIds);
$listClass = new ListClass();
$historyClass = new HistoryClass();
@@ -657,6 +664,8 @@
if (!is_array($userIds)) {
$userIds = [$userIds];
}
+ acym_arrayToInteger($userIds);
+ acym_arrayToInteger($lists);
$listClass = new ListClass();
$unsubscribedFromLists = false;
@@ -771,6 +780,7 @@
return;
}
+ acym_arrayToInteger($userIds);
acym_arrayToInteger($listIds);
acym_query(
@@ -1135,9 +1145,10 @@
if (!acym_isAdmin()) {
$hiddenlistsString = acym_getVar('string', 'hiddenlists', '');
$hiddenlists = explode(',', $hiddenlistsString);
- acym_arrayToInteger($hiddenlists);
$visibleSubscription = acym_getVar('array', 'subscription', []);
$subscribeLists = array_merge($hiddenlists, $visibleSubscription);
+ acym_arrayToInteger($subscribeLists);
+
if (!empty($subscribeLists)) {
foreach ($subscribeLists as $oneListId) {
$formData['listsub'][$oneListId] = ['status' => 1];
--- a/acymailing/back/Controllers/Configuration/Listing.php
+++ b/acymailing/back/Controllers/Configuration/Listing.php
@@ -386,7 +386,7 @@
'name' => self::CRON_TASK_NAME,
'taskFrequency' => 'every_minute',
'taskId' => $currentTaskId,
- 'config' => $formData
+ 'config' => $formData,
]
);
@@ -401,7 +401,8 @@
private function handleAcl(array &$formData): void
{
- if (ACYM_PRODUCTION) {
+ $aclPermissions = acym_cmsPermission();
+ if (ACYM_PRODUCTION && !empty($aclPermissions)) {
$aclPages = array_keys(acym_getPagesForAcl());
foreach ($aclPages as $page) {
if (empty($formData['acl_'.$page])) {
@@ -423,16 +424,21 @@
'acy_notification_subform',
'acy_notification_profile',
'acy_notification_confirm',
- 'wp_access',
'multilingual_languages',
'allowed_hosts',
'unsub_survey',
];
+ $aclPermissions = acym_cmsPermission();
+ if (!empty($aclPermissions)) {
+ $select2Fields[] = 'wp_access';
+ }
+
foreach ($select2Fields as $oneField) {
if ($oneField === 'unsub_survey' && !empty($formData[$oneField])) {
$formData[$oneField] = json_encode($formData[$oneField]);
}
+
if (empty($formData[$oneField])) {
$formData[$oneField] = [];
}
--- a/acymailing/back/Controllers/DashboardController.php
+++ b/acymailing/back/Controllers/DashboardController.php
@@ -44,7 +44,7 @@
$splashJson = acym_fileGetContent(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON);
$version = json_decode($splashJson);
- if (version_compare($this->config->get('previous_version', '10.10.2'), $version->max_version, '>=')) {
+ if (version_compare($this->config->get('previous_version', '10.11.1'), $version->max_version, '>=')) {
@unlink(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON);
$this->listing();
--- a/acymailing/back/Controllers/EntitySelectController.php
+++ b/acymailing/back/Controllers/EntitySelectController.php
@@ -41,6 +41,10 @@
return ['error' => acym_translation('ACYM_MISSING_PARAMETERS')];
}
+ if (!in_array($entity, ['list', 'user'])) {
+ return ['error' => acym_translation('ACYM_UNAUTHORIZED_ACCESS')];
+ }
+
$entityParams = [
'offset' => $offset,
'elementsPerPage' => $perCalls,
@@ -49,8 +53,15 @@
if ($entity === 'list') {
$entityParams['status'] = 'active';
}
- if (!empty($join)) $entityParams['join'] = $join;
- if (!empty($columnsToDisplay)) $entityParams['columns'] = $columnsToDisplay;
+ if (!empty($join)) {
+ $entityParams['join'] = $join;
+ }
+ if (!empty($columnsToDisplay)) {
+ foreach ($columnsToDisplay as $column) {
+ acym_secureDBColumn($column);
+ }
+ $entityParams['columns'] = $columnsToDisplay;
+ }
if ('list' === $entity) {
$entityParams['columns'][] = 'description';
--- a/acymailing/back/Controllers/Fields/Edition.php
+++ b/acymailing/back/Controllers/Fields/Edition.php
@@ -111,7 +111,7 @@
public function ajaxGetTables(): void
{
$database = acym_getVar('string', 'database');
- $allTables = acym_loadResultArray('SHOW TABLES FROM `'.$database.'`');
+ $allTables = acym_loadResultArray('SHOW TABLES FROM `'.acym_secureDBColumn($database).'`');
acym_sendAjaxResponse('', ['tables' => $allTables]);
}
@@ -121,7 +121,7 @@
$table = acym_getVar('string', 'table');
$database = acym_getVar('string', 'database');
- $columns = acym_loadResultArray('SHOW COLUMNS FROM `'.$table.'` FROM `'.$database.'`');
+ $columns = acym_loadResultArray('SHOW COLUMNS FROM `'.acym_secureDBColumn($table).'` FROM `'.acym_secureDBColumn($database).'`');
array_unshift($columns, 'ACYM_CHOOSE_COLUMN');
acym_sendAjaxResponse('', ['columns' => $columns]);
--- a/acymailing/back/Core/wordpress/extension.php
+++ b/acymailing/back/Core/wordpress/extension.php
@@ -30,37 +30,37 @@
(object)[
'title' => acym_translation('ACYM_ARTICLE'),
'folder_name' => 'post',
- 'version' => '10.10.2',
+ 'version' => '10.11.1',
'active' => '1',
'category' => 'Content management',
'level' => 'starter',
'uptodate' => '1',
'description' => '- Insert WordPress posts in your emails<br/>- Insert the latest posts of a category in an automatic email',
- 'latest_version' => '10.10.2',
+ 'latest_version' => '10.11.1',
'type' => 'CORE',
],
(object)[
'title' => acym_translation('ACYM_PAGE'),
'folder_name' => 'page',
- 'version' => '10.10.2',
+ 'version' => '10.11.1',
'active' => '1',
'category' => 'Content management',
'level' => 'starter',
'uptodate' => '1',
'description' => '- Insert pages in your emails',
- 'latest_version' => '10.10.2',
+ 'latest_version' => '10.11.1',
'type' => 'CORE',
],
(object)[
'title' => acym_translation('ACYM_CREATE_USER'),
'folder_name' => 'createuser',
- 'version' => '10.10.2',
+ 'version' => '10.11.1',
'active' => '1',
'category' => 'User management',
'level' => 'starter',
'uptodate' => '1',
'description' => '- Automatically creates a site user when an AcyMailing subscriber is created',
- 'latest_version' => '10.10.2',
+ 'latest_version' => '10.11.1',
'type' => 'CORE',
],
];
--- a/acymailing/back/Core/wordpress/form.php
+++ b/acymailing/back/Core/wordpress/form.php
@@ -211,7 +211,7 @@
$formClass = $params->get('formclass', '');
$alignment = $params->get('alignment', 'none');
- $style = $alignment == 'none' ? '' : 'style="text-align: '.$alignment.'"';
+ $style = $alignment === 'none' ? '' : 'style="text-align: '.acym_escape($alignment).'"';
$termsURL = acym_getArticleURL($params->get('termscontent', 0), false, 'ACYM_TERMS_CONDITIONS');
$privacyURL = acym_getArticleURL($params->get('privacypolicy', 0), false, 'ACYM_PRIVACY_POLICY');
@@ -219,14 +219,14 @@
if (empty($termsURL)) {
$termsURL = $params->get('termscontentURL') ?? '';
if (!empty($termsURL)) {
- $termsURL = '<a href="'.acym_escape($termsURL).'" target="_blank">'.acym_translation('ACYM_TERMS_CONDITIONS').'</a>';
+ $termsURL = '<a href="'.acym_escapeUrl($termsURL).'" target="_blank">'.acym_escape(acym_translation('ACYM_TERMS_CONDITIONS')).'</a>';
}
}
if (empty($privacyURL)) {
$privacyURL = $params->get('privacypolicyURL') ?? '';
if (!empty($privacyURL)) {
- $privacyURL = '<a href="'.acym_escape($privacyURL).'" target="_blank">'.acym_translation('ACYM_PRIVACY_POLICY').'</a>';
+ $privacyURL = '<a href="'.acym_escapeUrl($privacyURL).'" target="_blank">'.acym_escape(acym_translation('ACYM_PRIVACY_POLICY')).'</a>';
}
}
@@ -256,12 +256,12 @@
</script>';
$buttonStyle = '';
- if (!empty($params->get('button_background_color', ''))) $buttonStyle .= 'background-color: '.$params->get('button_background_color', '').';';
- if (!empty($params->get('button_text_color', ''))) $buttonStyle .= 'color: '.$params->get('button_text_color', '').';';
- if (strlen($params->get('button_border_size', '')) > 0) $buttonStyle .= 'border-width: '.$params->get('button_border_size', '').'px;';
- if (!empty($params->get('button_border_type', ''))) $buttonStyle .= 'border-style: '.$params->get('button_border_type', '').';';
- if (!empty($params->get('button_border_color', ''))) $buttonStyle .= 'border-color: '.$params->get('button_border_color', '').';';
- if (strlen($params->get('button_border_radius', '')) > 0) $buttonStyle .= 'border-radius: '.$params->get('button_border_radius', '').'px;';
+ if (!empty($params->get('button_background_color', ''))) $buttonStyle .= 'background-color: '.acym_escape($params->get('button_background_color', '')).';';
+ if (!empty($params->get('button_text_color', ''))) $buttonStyle .= 'color: '.acym_escape($params->get('button_text_color', '')).';';
+ if (strlen($params->get('button_border_size', '')) > 0) $buttonStyle .= 'border-width: '.acym_escape($params->get('button_border_size', '')).'px;';
+ if (!empty($params->get('button_border_type', ''))) $buttonStyle .= 'border-style: '.acym_escape($params->get('button_border_type', '')).';';
+ if (!empty($params->get('button_border_color', ''))) $buttonStyle .= 'border-color: '.acym_escape($params->get('button_border_color', '')).';';
+ if (strlen($params->get('button_border_radius', '')) > 0) $buttonStyle .= 'border-radius: '.acym_escape($params->get('button_border_radius', '')).'px;';
if (!empty($buttonStyle)) {
acym_addStyle(true, '#acym_module_'.$formName.' .acysubbuttons .subbutton {'.$buttonStyle.'}');
@@ -277,24 +277,24 @@
ob_start();
?>
- <div class="acym_module <?php echo acym_escape($formClass); ?>" id="acym_module_<?php echo $formName; ?>">
- <div class="acym_fulldiv" id="acym_fulldiv_<?php echo $formName; ?>" <?php echo $style; ?>>
+ <div class="acym_module <?php echo acym_escape($formClass); ?>" id="acym_module_<?php echo acym_escape($formName); ?>">
+ <div class="acym_fulldiv" id="acym_fulldiv_<?php echo acym_escape($formName); ?>" <?php echo $style; ?>>
<form enctype="multipart/form-data"
- id="<?php echo acym_escape($formName); ?>"
- name="<?php echo acym_escape($formName); ?>"
- method="POST"
- action="<?php echo acym_escape($formAction); ?>"
- onsubmit="return submitAcymForm('subscribe','<?php echo $formName; ?>')">
+ id="<?php echo acym_escape($formName); ?>"
+ name="<?php echo acym_escape($formName); ?>"
+ method="POST"
+ action="<?php echo acym_escape($formAction); ?>"
+ onsubmit="return submitAcymForm('subscribe','<?php echo acym_escape($formName); ?>')">
<div class="acym_module_form">
<?php
$introText = $params->get('introtext', '');
if (!empty($introText)) {
- echo '<div class="acym_introtext">'.$introText.'</div>';
+ echo '<div class="acym_introtext">'.acym_escape($introText).'</div>';
}
- if ($params->get('mode', 'tableless') == 'tableless') {
+ if ($params->get('mode', 'tableless') === 'tableless') {
include ACYM_FOLDER.'widgets'.DS.'subscriptionform'.DS.'tmpl'.DS.'tableless.php';
} else {
- $displayInline = $params->get('mode', 'tableless') != 'vertical';
+ $displayInline = $params->get('mode', 'tableless') !== 'vertical';
include ACYM_FOLDER.'widgets'.DS.'subscriptionform'.DS.'tmpl'.DS.'default.php';
}
?>
@@ -319,7 +319,7 @@
<?php
$postText = $params->get('posttext', '');
if (!empty($postText)) {
- echo '<div class="acym_posttext">'.$postText.'</div>';
+ echo '<div class="acym_posttext">'.acym_escape($postText).'</div>';
}
?>
</form>
--- a/acymailing/back/Core/wordpress/security.php
+++ b/acymailing/back/Core/wordpress/security.php
@@ -261,3 +261,12 @@
{
return wp_salt('auth');
}
+
+function acym_escapeUrl(string $url): string
+{
+ if (empty($url)) {
+ return '';
+ }
+
+ return esc_url($url);
+}
--- a/acymailing/back/Core/wplangindexer.php
+++ b/acymailing/back/Core/wplangindexer.php
@@ -1,5 +1,10 @@
<?php
+__('IP address collection', 'acymailing');
+__('Anonymized', 'acymailing');
+__('The IP addresses are collected during confirmation and subscription for proof of consent and to limit the number of subscriptions per IP address.', 'acymailing');
+__('Tracking delay (seconds)', 'acymailing');
+__('Delay after a send during which open and click statistics are not recorded. This allows you to avoid recording clicks and opens due to image/link verification bots.', 'acymailing');
__('No valid test email addresses found. Please check the email addresses you entered and try again.', 'acymailing');
__('When active, URLs containing the AcyMailing subscriber ID and temporary token will automatically log the user in when clicked. The expected format is https://example.com?autoSubId={subscriber:id}&subKey={subscriber:autologin_token|urlencode}', 'acymailing');
__('An error occurred.', 'acymailing');
--- a/acymailing/back/Helpers/CronHelper.php
+++ b/acymailing/back/Helpers/CronHelper.php
@@ -288,7 +288,7 @@
$newConfig = [
'cron_last' => $time,
- 'cron_fromip' => acym_getIP(),
+ 'cron_fromip' => acym_getIP(true),
'cron_next' => $nextCronTime + $cronFrequency,
];
--- a/acymailing/back/Helpers/MigrationHelper.php
+++ b/acymailing/back/Helpers/MigrationHelper.php
@@ -50,7 +50,7 @@
foreach ($fields as $key => $field) {
if (in_array($field, $columnUserTable)) {
- $fieldToCheck[$key] = '`'.$field.'`';
+ $fieldToCheck[$key] = '`'.acym_secureDBColumn($field).'`';
}
}
--- a/acymailing/back/Helpers/Update/Configuration.php
+++ b/acymailing/back/Helpers/Update/Configuration.php
@@ -122,7 +122,7 @@
$allPref['Starter'] = ACYM_STARTER;
$allPref['Essential'] = ACYM_ESSENTIAL;
$allPref['Enterprise'] = ACYM_ENTERPRISE;
- $allPref['previous_version'] = '10.10.2';
+ $allPref['previous_version'] = '10.11.1';
$allPref['display_built_by'] = acym_level(ACYM_ESSENTIAL) ? 0 : 1;
$allPref['php_overrides'] = 0;
--- a/acymailing/back/Helpers/Update/DefaultData.php
+++ b/acymailing/back/Helpers/Update/DefaultData.php
@@ -31,12 +31,12 @@
$forwardEmail = acym_currentUserEmail();
}
- $forwardEmail = str_replace('"', '', $forwardEmail);
+ $forwardAction = acym_escapeDB(json_encode(['0' => 'delete_message', '1' => 'forward_message', 'forward_to' => $forwardEmail]));
$query = "INSERT INTO `#__acym_rule` (`id`, `name`, `description`, `ordering`, `regex`, `executed_on`, `action_message`, `action_user`, `active`, `increment_stats`, `execute_action_after`) VALUES ";
$query .= "(1, 'ACYM_LIST_UNSUBSCRIBE_HANDLING', 'ACYM_LIST_UNSUBSCRIBE_HANDLING_DESC', 1, 'Please unsubscribe user ID \\d+', '["body"]', '["delete_message"]', '["unsubscribe_user"]', 1, 0, 0),";
$query .= "(2, 'ACYM_SUPPRESSION_LIST', 'ACYM_SUPPRESSION_LIST_DESC', 2, 'suppression list', '["body"]', '["delete_message"]', '["unsubscribe_user","block_user","empty_queue_user"]', 1, 1, 0),";
- $query .= "(3, 'ACYM_ACTION_REQUIRED', 'ACYM_ACTION_REQUIRED_DESC', 3, 'action *requ|verif', '["subject"]', '{"0":"delete_message","1":"forward_message","forward_to":"".$forwardEmail.""}', '[]', 1, 0, 0),";
+ $query .= "(3, 'ACYM_ACTION_REQUIRED', 'ACYM_ACTION_REQUIRED_DESC', 3, 'action *requ|verif', '["subject"]', ".$forwardAction.", '[]', 1, 0, 0),";
$query .= "(4, 'ACYM_ACKNOWLEDGMENT_RECEIPT_SUBJECT', 'ACYM_ACKNOWLEDGMENT_RECEIPT_SUBJECT_DESC', 4, '(out|away) *(of|from)|vacation|vacanze|vacaciones|holiday|absen|congés|recept|acknowledg|thank you for|Auto *Response|Incident|Automati|Ticket|Resposta *automática', '["subject"]', '["delete_message"]', '[]', 1, 0, 0),";
$query .= "(5, 'ACYM_FEEDBACK_LOOP', 'ACYM_FEEDBACK_LOOP_DESC', 5, 'feedback|staff@hotmail.com|complaints@.{0,15}email-abuse.amazonses.com|complaint about message', '["senderInfo","subject"]', '["save_message","delete_message"]', '["unsubscribe_user","block_user","empty_queue_user"]', 1, 0, 0),";
$query .= "(6, 'ACYM_FEEDBACK_LOOP_BODY', 'ACYM_FEEDBACK_LOOP_BODY_DESC', 6, 'Feedback-Type.{1,5}abuse', '["body"]', '["save_message","delete_message"]', '["unsubscribe_user"]', 1, 1, 0),";
@@ -44,13 +44,13 @@
$query .= "(8, 'ACYM_BLOCKED_GOOGLE_GROUPS', 'ACYM_BLOCKED_GOOGLE_GROUPS_DESC', 8, 'message *rejected *by *Google *Groups', '["body"]', '["delete_message"]', '["block_user"]', 1, 1, 3),";
$query .= "(9, 'ACYM_REJECTED', 'ACYM_REJECTED_DESC', 9, 'rejected *your *message|email *provider *rejected *it', '["body"]', '["delete_message"]', '["block_user"]', 1, 1, 3),";
$query .= "(10, 'ACYM_MAILBOX_DOESNT_EXIST_1', 'ACYM_MAILBOX_DOESNT_EXIST_1_DESC', 10, '(Invalid|no such|unknown|bad|des?activated|inactive|unrouteable) *(mail|destination|recipient|user|address|person)|bad-mailbox|inactive-mailbox|not listed in.{1,20}directory|RecipNotFound|(user|mailbox|address|recipients?|host|account|domain) *(is|has been)? *(error|disabled|failed|unknown|unavailable|not *(found|available)|.{1,30}inactiv)|no *mailbox *here|user does.?n.t have.{0,30}account|no *longer *(active|working|in *use)|mail( *foi)? *desativado|recipient '[^']+' not known', '["subject","body"]', '["save_message","delete_message"]', '["block_user"]', 1, 1, 0),";
- $query .= "(11, 'ACYM_MESSAGE_BLOCKED_RECIPIENTS', 'ACYM_MESSAGE_BLOCKED_RECIPIENTS_DESC', 11, 'blocked *by|block *list|look(ed)? *like *spam|spam-related|spam *detected| CXBL | CDRBL | IPBL | URLBL |(unacceptable|banned|offensive|filtered|blocked|unsolicited) *(content|message|e?-?mail)|service refused|(status(-code)?|554) *(:|=)? *5.7.1|administratively *denied|blacklisted *IP|policy *reasons|rejected.{1,10}spam|junkmail *rejected|throttling *constraints|exceeded.{1,10}max.{1,40}hour|comply with required standards|421 RP-00|550 SC-00|550 DY-00|550 OU-00|client *[0-9.]* *blocked *using', '["body"]', '{"0":"delete_message","1":"forward_message","forward_to":"".$forwardEmail.""}', '["block_user"]', 1, 1, 3),";
+ $query .= "(11, 'ACYM_MESSAGE_BLOCKED_RECIPIENTS', 'ACYM_MESSAGE_BLOCKED_RECIPIENTS_DESC', 11, 'blocked *by|block *list|look(ed)? *like *spam|spam-related|spam *detected| CXBL | CDRBL | IPBL | URLBL |(unacceptable|banned|offensive|filtered|blocked|unsolicited) *(content|message|e?-?mail)|service refused|(status(-code)?|554) *(:|=)? *5.7.1|administratively *denied|blacklisted *IP|policy *reasons|rejected.{1,10}spam|junkmail *rejected|throttling *constraints|exceeded.{1,10}max.{1,40}hour|comply with required standards|421 RP-00|550 SC-00|550 DY-00|550 OU-00|client *[0-9.]* *blocked *using', '["body"]', ".$forwardAction.", '["block_user"]', 1, 1, 3),";
$query .= "(12, 'ACYM_MAILBOX_DOESNT_EXIST_2', 'ACYM_MAILBOX_DOESNT_EXIST_2_DESC', 12, 'status(-? ?code)? *(:|=)? *(550)? *5.(1.[1-6]|0.0|4.[0123467])|recipient *(address *)?rejected|does *not *like *recipient|recipient *unknown *to *address|email *account *that *you *tried *to *reach *is *disabled|no *mail-enabled *subscriptions', '["subject","body"]', '["save_message","delete_message"]', '["block_user"]', 1, 1, 0),";
$query .= "(13, 'ACYM_DOMAIN_NOT_EXIST', 'ACYM_DOMAIN_NOT_EXIST_DESC', 13, 'No.{1,10}MX *(record|host)|host *does *not *receive *any *mail|bad-domain|connection.{1,10}mail.{1,20}fail|domain.{1,10}not *exist|fail.{1,10}establish *connection|Unable *to *lookup *DNS *for|Unable *to *connect *to *remote *host', '["subject","body"]', '["save_message","delete_message"]', '["block_user"]', 1, 1, 0),";
$query .= "(14, 'ACYM_TEMPORARY_FAILURES', 'ACYM_TEMPORARY_FAILURES_DESC', 14, 'has.*been.*delayed|delayed *mail|message *delayed|message-expired|temporar(il)?y *(failure|unavailable|disable|offline|unable)|deferred|delayed *([0-9]*) *(hour|minut)|possible *mail *loop|too *many *hops|delivery *time *expired|Action.php: *delayed|status(-code)? *(:|=)? *4.4.6|will continue to be attempted|unable to deliver in.*Status: 4.4.7|Connection *closed *unexpectedly', '["subject","body"]', '["save_message","delete_message"]', '["block_user"]', 1, 1, 3),";
$query .= "(15, 'ACYM_FAILED_PERM', 'ACYM_FAILED_PERM_DESC', 15, 'failed *permanently|permanent.{1,20}(failure|error)|not *accepting *(any)? *mail|does *not *exist|no *valid *route|delivery *failure', '["subject","body"]', '["save_message","delete_message"]', '["block_user"]', 1, 1, 0),";
$query .= "(16, 'ACYM_ACKNOWLEDGMENT_RECEIPT_BODY', 'ACYM_ACKNOWLEDGMENT_RECEIPT_BODY_DESC', 16, 'vacanc|holiday|vacation|absen|urlaub|ferie|feriado|vacanz|vacaciones|(out *of|not *in|outside)( *the)? *office|automatisch *(generierte)? *Antwort|confirm *we(\'ve| *have) *received|den *Ferien|automática|RISPOSTA AUTOMATICA|vakantie|recepcionado *(su *)?requerimiento|Kiitos viestistäsi|nicht im Büro|nicht am Arbeitsplatz|automatic *reply|auto(-|mated *|matic *)reply|Email *has *been *recived|ricevuto *il *Suo *messaggio|ticket|poza *biurem|Automatic *respon|Case *Number|Αυτόματη *απάντηση', '["body"]', '["delete_message"]', '[]', 1, 0, 0),";
- $query .= "(17, 'ACYM_FINAL_RULE', 'ACYM_FINAL_RULE_DESC', 17, '.', '["senderInfo","subject"]', '{"0":"delete_message","1":"forward_message","forward_to":"".$forwardEmail.""}', '[]', 1, 0, 0);";
+ $query .= "(17, 'ACYM_FINAL_RULE', 'ACYM_FINAL_RULE_DESC', 17, '.', '["senderInfo","subject"]', ".$forwardAction.", '[]', 1, 0, 0);";
acym_query($query);
--- a/acymailing/back/Helpers/Update/Patchv6.php
+++ b/acymailing/back/Helpers/Update/Patchv6.php
@@ -511,6 +511,7 @@
$phoneFields = acym_loadResultArray('SELECT `id` FROM #__acym_field WHERE `type` = "phone"');
if (!empty($phoneFields)) {
+ acym_arrayToInteger($phoneFields);
$this->updateQuery('DELETE FROM #__acym_user_has_field WHERE `value` LIKE "%," AND `field_id` IN ('.implode(', ', $phoneFields).')');
}
}
--- a/acymailing/back/Helpers/Update/Patchv8.php
+++ b/acymailing/back/Helpers/Update/Patchv8.php
@@ -296,6 +296,7 @@
);
if (!empty($mailsToClean)) {
+ acym_arrayToInteger($mailsToClean);
$this->updateQuery('DELETE FROM #__acym_mail_archive WHERE mail_id IN ('.implode(',', $mailsToClean).')');
$mailClass = new MailClass();
$mailClass->delete($mailsToClean);
--- a/acymailing/back/Helpers/UpdateHelper.php
+++ b/acymailing/back/Helpers/UpdateHelper.php
@@ -21,7 +21,7 @@
const BOUNCE_VERSION = 9;
private string $level = 'starter';
- private string $version = '10.10.2';
+ private string $version = '10.11.1';
private string $previousVersion;
private bool $isUpdating = false;
--- a/acymailing/back/Helpers/global/email.php
+++ b/acymailing/back/Helpers/global/email.php
@@ -42,25 +42,28 @@
}
if (!$checkDomain || empty($mxhosts)) {
$dns = @dns_get_record($domain, DNS_A);
+ if (empty($dns)) {
+ return false;
+ }
+
$domainChanged = true;
foreach ($dns as $oneRes) {
if (strtolower($oneRes['host']) == strtolower($domain)) {
$domainChanged = false;
}
}
- if (empty($dns) || $domainChanged) {
+
+ if ($domainChanged) {
return false;
}
}
}
- $object = new stdClass();
- $object->IP = acym_getIP();
- $object->emailAddress = $email;
+ $ip = acym_getIP();
- if ($config->get('email_iptimecheck', 0)) {
+ if (!empty($ip) && $config->get('email_iptimecheck', 0)) {
$lapseTime = time() - 7200;
- $nbUsers = acym_loadResult('SELECT COUNT(*) FROM #__acym_user WHERE creation_date > '.intval($lapseTime).' AND ip = '.acym_escapeDB($object->IP));
+ $nbUsers = acym_loadResult('SELECT COUNT(*) FROM #__acym_user WHERE creation_date > '.intval($lapseTime).' AND ip = '.acym_escapeDB($ip));
if ($nbUsers >= 3) {
return false;
}
--- a/acymailing/back/Helpers/global/security.php
+++ b/acymailing/back/Helpers/global/security.php
@@ -23,98 +23,20 @@
return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
}
-function acym_escapeUrl(string $url): string
-{
- if (empty($url)) {
- return '';
- }
-
- $url = str_replace(' ', '%20', ltrim($url));
- $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$|*'()[]\x80-\xff]|i', '', $url);
-
- if (empty($url)) {
- return '';
- }
-
- if (0 !== stripos($url, 'mailto:')) {
- $strip = ['%0d', '%0a', '%0D', '%0A'];
- $count = 1;
- while ($count) {
- $url = str_replace($strip, '', $url, $count);
- }
- }
-
- $url = str_replace(';//', '://', $url);
- if (strpos($url, ':') === false && !in_array($url[0], ['/', '#', '?'], true) && !preg_match('/^[a-z0-9-]+?.php/i', $url)) {
- $url = 'https://'.$url;
- }
-
- $url = str_replace('&', '&', $url);
- $url = str_replace("'", ''', $url);
-
- if (strpos($url, '[') !== false || strpos($url, ']') !== false) {
- $to_unset = [];
-
- if (strpos($url, '//') === 0) {
- $to_unset[] = 'scheme';
- $url = 'placeholder:'.$url;
- } elseif (strpos($url, '/') === 0) {
- $to_unset[] = 'scheme';
- $to_unset[] = 'host';
- $url = 'placeholder://placeholder'.$url;
- }
-
- $parsed = parse_url($url);
-
- if (!empty($parsed)) {
- foreach ($to_unset as $key) {
- unset($parsed[$key]);
- }
- }
-
- $front = '';
-
- if (isset($parsed['scheme'])) {
- $front .= $parsed['scheme'].'://';
- } elseif ('/' === $url[0]) {
- $front .= '//';
- }
-
- if (isset($parsed['user'])) {
- $front .= $parsed['user'];
- }
-
- if (isset($parsed['pass'])) {
- $front .= ':'.$parsed['pass'];
- }
-
- if (isset($parsed['user']) || isset($parsed['pass'])) {
- $front .= '@';
- }
-
- if (isset($parsed['host'])) {
- $front .= $parsed['host'];
- }
-
- if (isset($parsed['port'])) {
- $front .= ':'.$parsed['port'];
- }
-
- $end_dirty = str_replace($front, '', $url);
- $end_clean = str_replace(['[', ']'], ['%5B', '%5D'], $end_dirty);
- $url = str_replace($end_dirty, $end_clean, $url);
- }
-
- return $url;
-}
-
function acym_arrayToInteger(array &$array): void
{
$array = @array_map('intval', $array);
}
-function acym_getIP(): string
+function acym_getIP(bool $full = false): string
{
+ $config = acym_config();
+ $ipCollection = $config->get('ip_collection', 'yes');
+
+ if (!$full && $ipCollection === 'no') {
+ return '';
+ }
+
$map = [
'HTTP_X_FORWARDED_IP',
'X_FORWARDED_FOR',
@@ -139,7 +61,40 @@
$ipAddress = trim(end($addresses));
}
- return strip_tags($ipAddress);
+ $ipAddress = strip_tags($ipAddress);
+
+ if ($full || $ipCollection === 'yes') {
+ return $ipAddress;
+ }
+
+ return acym_anonymizeIP($ipAddress);
+}
+
+function acym_anonymizeIP(string $ipAddress): string
+{
+ if (empty($ipAddress)) {
+ return '';
+ }
+
+ if (strpos($ipAddress, ':') !== false) {
+ $packed = inet_pton($ipAddress);
+ if ($packed === false) {
+ return '';
+ }
+
+ $anonymized = substr($packed, 0, 8).str_repeat("x00", 8);
+
+ return inet_ntop($anonymized);
+ }
+
+ $parts = explode('.', $ipAddress);
+ if (count($parts) !== 4) {
+ return '';
+ }
+
+ $parts[3] = '0';
+
+ return implode('.', $parts);
}
function acym_generateKey(int $length): string
--- a/acymailing/back/Partial/forms/termspolicy.php
+++ b/acymailing/back/Partial/forms/termspolicy.php
@@ -26,11 +26,11 @@
}
if (!empty($termspolicy['privacy_type']) && $termspolicy['privacy_type'] === 'url' && !empty($privacyURL)) {
- $privacyURL = '<a href="'.acym_escapeUrl($privacyURL).'" target="_blank">'.acym_translation('ACYM_PRIVACY_POLICY').'</a>';
+ $privacyURL = '<a href="'.acym_escapeUrl($privacyURL).'" target="_blank">'.acym_escape(acym_translation('ACYM_PRIVACY_POLICY')).'</a>';
}
if (!empty($termspolicy['terms_type']) && $termspolicy['terms_type'] === 'url' && !empty($termsURL)) {
- $termsURL = '<a href="'.acym_escapeUrl($termsURL).'" target="_blank">'.acym_translation('ACYM_TERMS_CONDITIONS').'</a>';
+ $termsURL = '<a href="'.acym_escapeUrl($termsURL).'" target="_blank">'.acym_escape(acym_translation('ACYM_TERMS_CONDITIONS')).'</a>';
}
--- a/acymailing/back/Views/Configuration/tmpl/data.php
+++ b/acymailing/back/Views/Configuration/tmpl/data.php
@@ -22,6 +22,29 @@
'xlarge-3 medium-5 small-9'
); ?>
</div>
+ <div class="grid-x grid-margin-x margin-top-1">
+ <label class="cell large-3" for="security_key">
+ <?php echo acym_translation('ACYM_IP_COLLECTION').acym_info(['textShownInTooltip' => 'ACYM_IP_COLLECTION_DESC']); ?>
+ </label>
+ <div class="cell large-9">
+ <div>
+ <?php
+ echo acym_select(
+ [
+ 'yes' => acym_translation('ACYM_YES'),
+ 'anonymised' => acym_translation('ACYM_ANONYMISED'),
+ 'no' => acym_translation('ACYM_NO'),
+ ],
+ 'config[ip_collection]',
+ $this->config->get('ip_collection', 'yes'),
+ [
+ 'class' => 'acym__select intext_select',
+ ]
+ );
+ ?>
+ </div>
+ </div>
+ </div>
</div>
<div class="cell margin-bottom-2">
@@ -70,6 +93,32 @@
);
?>
</div>
+ <div class="cell grid-x margin-y margin-top-1">
+ <div class="cell medium-3">
+ <label for="tracking_delay">
+ <?php
+ echo acym_escape(acym_translation('ACYM_TRACKING_DELAY'));
+ echo acym_info(
+ [
+ 'textShownInTooltip' => 'ACYM_TRACKING_DELAY_DESC',
+ ]
+ );
+ ?>
+ </label>
+ </div>
+ <div class="cell medium-9 grid-x">
+ <div class="cell medium-6 large-4 xlarge-3 xxlarge-2">
+ <input
+ id="tracking_delay"
+ type="number"
+ class="intext_input"
+ min="0"
+ name="config[tracking_delay]"
+ value="<?php echo intval($this->config->get('tracking_delay', 0)); ?>"
+ />
+ </div>
+ </div>
+ </div>
</div>
<div class="cell margin-bottom-2">
<div class="acym__title acym__title__secondary"><?php echo acym_translation('ACYM_DATA_MANAGEMENT'); ?></div>
@@ -201,16 +250,16 @@
<div class="cell xlarge-9 medium-7 small-12 acym_vcenter">
<label class="margin-right-1">
<input type="radio"
- name="config[csv_separator]"
- value=";"
+ name="config[csv_separator]"
+ value=";"
<?php echo $this->config->get('csv_separator', ',') === ';' ? 'checked="checked"' : ''; ?> />
;
</label>
<label>
<input type="radio"
- name="config[csv_separator]"
- value=","
+ name="config[csv_separator]"
+ value=","
<?php echo $this->config->get('csv_separator', ',') === ',' ? 'checked="checked"' : ''; ?> />
,
</label>
--- a/acymailing/back/dynamics/subscription/SubscriptionAutomationActions.php
+++ b/acymailing/back/dynamics/subscription/SubscriptionAutomationActions.php
@@ -48,7 +48,7 @@
$queryToProcess = 'INSERT IGNORE #__acym_user_has_list (`user_id`, `list_id`, `status`, `subscription_date`) ('.$query->getQuery(
[
'user.id',
- $action['list_id'],
+ intval($action['list_id']),
'1',
acym_escapeDB(acym_date(time(), 'Y-m-d H:i:s')),
]
--- a/acymailing/back/dynamics/subscription/SubscriptionFollowup.php
+++ b/acymailing/back/dynamics/subscription/SubscriptionFollowup.php
@@ -19,6 +19,7 @@
}
}
} else {
+ acym_arrayToInteger($followup->condition['lists']);
$lists = implode(',', $followup->condition['lists']);
$user = acym_loadObject('SELECT * FROM #__acym_user_has_list WHERE user_id = '.intval($userId).' AND status = 1 AND list_id IN ('.$lists.')');
}
--- a/acymailing/back/dynamics/time/TimeAutomationTriggers.php
+++ b/acymailing/back/dynamics/time/TimeAutomationTriggers.php
@@ -265,7 +265,7 @@
$execute = true;
}
- $nextExecutionDate[] = $execution + 2628000;
+ $nextExecutionDate[] = acym_getTime($triggers['on_day_month']['number'].' '.$triggers['on_day_month']['day'].' of next month '.$hour.':'.$minutes);
}
}
@@ -274,7 +274,7 @@
$execute = true;
} else {
if ($triggers['every']['type'] == 2628000) {
- $nextDate = new DateTime(acym_date($step->last_execution, 'Y-m-d H:m:i', false), new DateTimeZone('UTC'));
+ $nextDate = new DateTime(acym_date($step->last_execution, 'Y-m-d H:i:s', false), new DateTimeZone('UTC'));
$nextDate = $nextDate->add(new DateInterval('P'.$triggers['every']['number'].'M'));
$nextDate = $nextDate->getTimestamp();
} else {
--- a/acymailing/back/dynamics/user/UserAutomationConditions.php
+++ b/acymailing/back/dynamics/user/UserAutomationConditions.php
@@ -157,7 +157,7 @@
} else {
$lftrgt = acym_loadObject('SELECT lft, rgt FROM #__usergroups WHERE id = '.intval($options['group']));
$allSubGroups = acym_loadResultArray('SELECT id FROM #__usergroups WHERE lft > '.intval($lftrgt->lft).' AND rgt < '.intval($lftrgt->rgt));
- array_unshift($allSubGroups, $options['group']);
+ array_unshift($allSubGroups, intval($options['group']));
$value = ' IN ('.implode(', ', $allSubGroups).')';
}
--- a/acymailing/front/FrontControllers/FrontstatsController.php
+++ b/acymailing/front/FrontControllers/FrontstatsController.php
@@ -53,7 +53,8 @@
$userStatClass = new UserStatClass();
$userStat = $userStatClass->getOneByMailAndUserId($mailId, $userId);
- if (empty($userStat) || acym_getTimeFromUTCDate($userStat->send_date) > time() - 20) {
+ $delay = $this->config->get('tracking_delay', 0);
+ if (empty($userStat) || acym_isRobot() || (!empty($delay) && acym_getTimeFromUTCDate($userStat->send_date) > time() - $delay)) {
return;
}
--- a/acymailing/front/FrontControllers/FronturlController.php
+++ b/acymailing/front/FrontControllers/FronturlController.php
@@ -50,7 +50,8 @@
$userStatClass = new UserStatClass();
$userStat = $userStatClass->getOneByMailAndUserId($mailId, $userId);
- if (empty($mail) || empty($userStat) || acym_getTimeFromUTCDate($userStat->send_date) > time() - 20 || acym_isRobot()) {
+ $delay = $this->config->get('tracking_delay', 0);
+ if (empty($mail) || empty($userStat) || acym_isRobot() || (!empty($delay) && acym_getTimeFromUTCDate($userStat->send_date) > time() - $delay)) {
acym_redirect($this->resolveSubscriberTags($urlObject->url, $userId));
}
--- a/acymailing/front/FrontControllers/FrontusersController.php
+++ b/acymailing/front/FrontControllers/FrontusersController.php
@@ -209,13 +209,15 @@
$hiddenLists = trim(acym_getVar('string', 'hiddenlists', ''));
$hiddenSubscription = empty($hiddenLists) ? [] : explode(',', $hiddenLists);
$unsubscribeLists = array_merge($visibleSubscription, $hiddenSubscription);
+ acym_arrayToInteger($unsubscribeLists);
$mailId = acym_getVar('int', 'mail_id', 0);
if (!empty($mailId) && !empty($currentUser->id)) {
$userStatClass = new UserStatClass();
$userStat = $userStatClass->getOneByMailAndUserId($mailId, $currentUser->id);
- if (acym_isRobot() || (!empty($userStat) && acym_getTimeFromUTCDate($userStat->send_date) > time() - 20)) {
+ $delay = $this->config->get('tracking_delay', 0);
+ if (acym_isRobot() || (!empty($userStat) && !empty($delay) && acym_getTimeFromUTCDate($userStat->send_date) > time() - $delay)) {
return;
}
}
--- a/acymailing/index.php
+++ b/acymailing/index.php
@@ -5,7 +5,7 @@
* Author: AcyMailing Newsletter Team
* Author URI: https://www.acymailing.com
* License: GPLv3
- * Version: 10.10.2
+ * Version: 10.11.1
* Text Domain: acymailing
* Domain Path: /language
* Requires at least: 5.0
--- a/acymailing/vendor/autoload.php
+++ b/acymailing/vendor/autoload.php
@@ -13,10 +13,7 @@
echo $err;
}
}
- trigger_error(
- $err,
- E_USER_ERROR
- );
+ throw new RuntimeException($err);
}
require_once __DIR__ . '/composer/autoload_real.php';
--- a/acymailing/vendor/composer/InstalledVersions.php
+++ b/acymailing/vendor/composer/InstalledVersions.php
@@ -8,6 +8,8 @@
class InstalledVersions
{
+ private static $selfDir = null;
+
private static $installed;
private static $installedIsLocalDir;
@@ -190,6 +192,15 @@
self::$installedIsLocalDir = false;
}
+ private static function getSelfDir()
+ {
+ if (self::$selfDir === null) {
+ self::$selfDir = strtr(__DIR__, '\', '/');
+ }
+
+ return self::$selfDir;
+ }
+
private static function getInstalled()
{
if (null === self::$canGetVendors) {
@@ -200,7 +211,7 @@
$copiedLocalDir = false;
if (self::$canGetVendors) {
- $selfDir = strtr(__DIR__, '\', '/');
+ $selfDir = self::getSelfDir();
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
$vendorDir = strtr($vendorDir, '\', '/');
if (isset(self::$installedByVendor[$vendorDir])) {
--- a/acymailing/vendor/composer/autoload_static.php
+++ b/acymailing/vendor/composer/autoload_static.php
@@ -12,27 +12,27 @@
);
public static $prefixLengthsPsr4 = array (
- 'Z' =>
+ 'Z' =>
array (
'ZBateson\StreamDecorators\' => 26,
'ZBateson\MbWrapper\' => 19,
'ZBateson\MailMimeParser\' => 24,
),
- 'S' =>
+ 'S' =>
array (
'Symfony\Polyfill\Mbstring\' => 26,
'Symfony\Polyfill\Iconv\' => 23,
),
- 'P' =>
+ 'P' =>
array (
'Psr\Http\Message\' => 17,
'Psr\Container\' => 14,
),
- 'G' =>
+ 'G' =>
array (
'GuzzleHttp\Psr7\' => 16,
),
- 'A' =>
+ 'A' =>
array (
'AcyMailing\WpInit\' => 18,
'AcyMailing\Libraries\Symfony\CssSelector\' => 41,
@@ -44,70 +44,70 @@
);
public static $prefixDirsPsr4 = array (
- 'ZBateson\StreamDecorators\' =>
+ 'ZBateson\StreamDecorators\' =>
array (
0 => __DIR__ . '/..' . '/zbateson/stream-decorators/src',
),
- 'ZBateson\MbWrapper\' =>
+ 'ZBateson\MbWrapper\' =>
array (
0 => __DIR__ . '/..' . '/zbateson/mb-wrapper/src',
),
- 'ZBateson\MailMimeParser\' =>
+ 'ZBateson\MailMimeParser\' =>
array (
0 => __DIR__ . '/..' . '/zbateson/mail-mime-parser/src',
),
- 'Symfony\Polyfill\Mbstring\' =>
+ 'Symfony\Polyfill\Mbstring\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
),
- 'Symfony\Polyfill\Iconv\' =>
+ 'Symfony\Polyfill\Iconv\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-iconv',
),
- 'Psr\Http\Message\' =>
+ 'Psr\Http\Message\' =>
array (
0 => __DIR__ . '/..' . '/psr/http-factory/src',
1 => __DIR__ . '/..' . '/psr/http-message/src',
),
- 'Psr\Container\' =>
+ 'Psr\Container\' =>
array (
0 => __DIR__ . '/..' . '/psr/container/src',
),
- 'GuzzleHttp\Psr7\' =>
+ 'GuzzleHttp\Psr7\' =>
array (
0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',
),
- 'AcyMailing\WpInit\' =>
+ 'AcyMailing\WpInit\' =>
array (
0 => __DIR__ . '/../..' . '/WpInit',
),
- 'AcyMailing\Libraries\Symfony\CssSelector\' =>
+ 'AcyMailing\Libraries\Symfony\CssSelector\' =>
array (
0 => __DIR__ . '/../..' . '/back/Libraries/Symfony/CssSelector',
),
- 'AcyMailing\Libraries\Sabberworm\CSS\' =>
+ 'AcyMailing\Libraries\Sabberworm\CSS\' =>
array (
0 => __DIR__ . '/../..' . '/back/Libraries/Sabberworm/CSS/src',
),
- 'AcyMailing\Libraries\Pelago\Emogrifier\' =>
+ 'AcyMailing\Libraries\Pelago\Emogrifier\' =>
array (
0 => __DIR__ . '/../..' . '/back/Libraries/Pelago/Emogrifier/src',
),
- 'AcyMailing\' =>
+ 'AcyMailing\' =>
array (
0 => __DIR__ . '/../..' . '/back',
1 => __DIR__ . '/../..' . '/front',
),
- 'AcyMailerPhp\' =>
+ 'AcyMailerPhp\' =>
array (
0 => __DIR__ . '/../..' . '/back/Libraries/Mailer',
),
);
public static $prefixesPsr0 = array (
- 'P' =>
+ 'P' =>
array (
- 'Pimple' =>
+ 'Pimple' =>
array (
0 => __DIR__ . '/..' . '/pimple/pimple/src',
),
--- a/acymailing/vendor/composer/installed.php
+++ b/acymailing/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'acyba/acymailing',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => '635f839b16cfa971790a4d3d39e21c4457259663',
+ 'reference' => 'd4d217e9c7816779c98ad4436efa67d45c595b2a',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'acyba/acymailing' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => '635f839b16cfa971790a4d3d39e21c4457259663',
+ 'reference' => 'd4d217e9c7816779c98ad4436efa67d45c595b2a',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
--- a/acymailing/vendor/composer/platform_check.php
+++ b/acymailing/vendor/composer/platform_check.php
@@ -18,8 +18,7 @@
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
- trigger_error(
- 'Composer detected issues in your platform: ' . implode(' ', $issues),
- E_USER_ERROR
+ throw new RuntimeException(
+ 'Composer detected issues in your platform: ' . implode(' ', $issues)
);
}