espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
yuri
2015-10-19 15:37:41 +03:00
parent 5283d1b6ae e89c7c9328
commit 31c7fdcfa6
7 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Mail/FiltersMatcher.php
+2 -2
View File
@@ -36,7 +36,7 @@ class FiltersMatcher
{
foreach ($filterList as $filter) {
if ($filter->get('from')) {
if (strtolower($filter->get('from')) === strtolower($email->get('from'))) {
if ($this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
return true;
}
}
@@ -44,7 +44,7 @@ class FiltersMatcher
if ($email->get('to')) {
$toArr = explode(';', $email->get('to'));
foreach ($toArr as $to) {
if (strtolower($to) === strtolower($filter->get('to'))) {
if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
return true;
}
}
application/Espo/Resources/i18n/de_DE/Import.json
+2 -1
View File
@@ -18,7 +18,8 @@
"Create Only": "Nur erstellen",
"Create and Update": "Erstellen und aktualisieren",
"Update Only": "Nur aktualisieren",
"Update by": "Aktualisieren durch"
"Update by": "Aktualisieren durch",
"File (CSV)": "Datei (CSV)"
},
"messages": {
"utf8": "Sollte UTF-8 kodiert sein",
application/Espo/Resources/i18n/en_US/EmailFilter.json
+2 -2
View File
@@ -12,8 +12,8 @@
"name": "Just a name of the filter.",
"subject": "Use wildcard *:\n\ntext* - starts with text,\n*text* - contains text,\n*text - ends with text.",
"bodyContains": "Body of email contains any of specified words or phrases.",
"from": "Emails being sent from the specified address. Leave empty if not needed.",
"to": "Emails being sent to the specified address. Leave empty if not needed.",
"from": "Emails being sent from the specified address. Leave empty if not needed. You can use wildcard *.",
"to": "Emails being sent to the specified address. Leave empty if not needed. You can use wildcard *.",
"parent": "Leave it empty to apply this filter globally (to all incoming emails)."
}
}
application/Espo/Resources/i18n/en_US/Import.json
+2 -1
View File
@@ -19,7 +19,8 @@
"Create and Update": "Create & Update",
"Update Only": "Update Only",
"Update by": "Update by",
"Set as Not Duplicate": "Set as Not Duplicate"
"Set as Not Duplicate": "Set as Not Duplicate",
"File (CSV)": "File (CSV)"
},
"messages": {
"utf8": "Should be UTF-8 encoded",
application/Espo/Resources/metadata/entityDefs/EmailFilter.json
+4 -2
View File
@@ -9,12 +9,14 @@
"from": {
"type": "varchar",
"maxLength": 255,
"tooltip": true
"tooltip": true,
"trim": true
},
"to": {
"type": "varchar",
"maxLength": 255,
"tooltip": true
"tooltip": true,
"trim": true
},
"subject": {
"type": "varchar",
frontend/client/res/templates/import/step-1.tpl
+1 -1
View File
@@ -13,7 +13,7 @@
</select>
</div>
<div class="col-sm-4 form-group">
<label class="control-label">{{translate 'File' scope='Import'}}</label>
<label class="control-label">{{translate 'File (CSV)' scope='Import'}}</label>
<div>
<input type="file" id="import-file">
</div>
tests/Espo/Core/Mail/FiltersMatcherTest.php
+18
View File
@@ -89,6 +89,15 @@ class FiltersMatcherTest extends \PHPUnit_Framework_TestCase
$filterList = [$filter];
$this->assertTrue($this->object->match($email, $filterList));
$email = new \Espo\Entities\Email($this->emailDefs);
$email->set('from', 'test@tester');
$filter = new \Espo\Entities\EmailFilter($this->filterDefs);
$filter->set(array(
'from' => '*@tester'
));
$filterList = [$filter];
$this->assertTrue($this->object->match($email, $filterList));
$email->set('from', 'test@tester');
$email->set('to', 'test@tester;baraka@tester');
$filter = new \Espo\Entities\EmailFilter($this->filterDefs);
@@ -98,6 +107,15 @@ class FiltersMatcherTest extends \PHPUnit_Framework_TestCase
$filterList = [$filter];
$this->assertTrue($this->object->match($email, $filterList));
$email->set('from', 'test@tester');
$email->set('to', 'test@tester;baraka@man');
$filter = new \Espo\Entities\EmailFilter($this->filterDefs);
$filter->set(array(
'to' => '*@tester'
));
$filterList = [$filter];
$this->assertTrue($this->object->match($email, $filterList));
$email->set('subject', 'test hello man');
$filter = new \Espo\Entities\EmailFilter($this->filterDefs);
$filter->set(array(