Added PHPMailer recognition

This commit is contained in:
M66B 2021-11-10 20:15:54 +01:00
parent 582a5cb82a
commit a4afd84327
3 changed files with 29 additions and 0 deletions

View File

@ -1716,6 +1716,10 @@ public class MessageHelper {
if (!TextUtils.isEmpty(zeptomail))
return "zeptomail";
String xmailer = imessage.getHeader("X-Mailer", null);
if (!TextUtils.isEmpty(xmailer) && xmailer.contains("PHPMailer"))
return "phpmailer";
return null;
}

View File

@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="2498dp"
android:height="2500dp"
android:viewportWidth="817.1"
android:viewportHeight="817.1">
<path
android:pathData="m407.5,816.9c-132.3,0 -264.7,-0.1 -397,0.2 -8.6,0 -10.5,-2.1 -10.5,-10.5 0.2,-265.4 0.2,-530.7 0,-796.1 0,-8.5 2.1,-10.5 10.5,-10.5 265,0.3 530,0.3 795.1,0 9.3,0 11.5,2.3 11.5,11.5 -0.3,264.7 -0.3,529.4 0,794 0,9.3 -2.3,11.5 -11.5,11.5 -132.7,-0.2 -265.4,-0.1 -398.1,-0.1zM391.9,170.7c-0.6,3.4 -0.9,4.3 -0.9,5.3 0,115.6 0.1,231.2 -0.2,346.8 0,8.7 4,8.9 10.5,8.9 112.6,-0.1 225.1,-0.2 337.7,0.1 8.9,0 10.5,-2.9 10.5,-11 -0.2,-113.6 -0.2,-227.1 -0.2,-340.7 0,-2.5 1.1,-5.3 -1.9,-8.3 -13.6,12.6 -27.2,25.2 -40.7,37.8 -43,40.1 -86.1,80.1 -128.9,120.4 -6.2,5.8 -9.6,5.2 -15.5,-0.3 -42,-39.7 -84.4,-79 -126.6,-118.4 -14.2,-13.2 -28.4,-26.3 -43.8,-40.6zM69.3,302.7c0,73.1 0.1,146.3 -0.1,219.4 0,7.3 1.4,10.2 9.4,9.9 16.6,-0.7 33.3,-0.6 50,0 8,0.3 10.3,-2 10.2,-10.1 -0.4,-52 0.1,-104.1 -0.4,-156.1 -0.1,-9.4 1.5,-13 11.9,-12.5 19,0.8 38.1,0.6 57.1,-0.3 42.9,-2.2 79.3,-17.9 105.1,-53.7 33.4,-46.4 38.3,-96.4 14.3,-147.5 -23.4,-49.7 -65.4,-73.5 -119.9,-76.1 -42.2,-2 -84.3,-0.4 -126.5,-1.3 -8.8,-0.2 -11.4,1.8 -11.4,11 0.5,72.3 0.3,144.8 0.3,217.3zM746.4,75.3h-352.6c0.8,3.5 2.9,4.6 4.6,6.2 54.2,50.5 108.6,100.9 162.5,151.7 7.1,6.7 11,7.6 18.6,0.5 53.6,-50.6 107.7,-100.8 161.6,-151.2 2,-1.9 5.1,-3.4 5.3,-7.2zM413.9,707.5c-0.8,0 -1.7,-0.1 -2.5,-0.1 -8.6,-25.7 -18,-51.2 -25.5,-77.3 -3.3,-11.6 -8.9,-14.8 -20,-13.6 -5.5,0.6 -7.7,1.6 -7.6,7.6 0.3,32.3 0.1,64.6 0.1,96.9 0,4.3 -0.3,7.9 6,8 6.8,0.2 6.8,-3.5 6.7,-8.4 -0.1,-26.9 -0.1,-53.7 0,-80.6 0,-2.7 -0.9,-5.8 2,-9.5 1.4,3.8 2.4,6.5 3.4,9.2 8.7,25.4 17.4,50.8 26.2,76.1 1.6,4.7 2.3,9.3 9.8,9.2 7,-0.1 8.4,-3.7 10.1,-8.8 8.9,-26.1 17.8,-52.1 26.8,-78.1 0.8,-2.3 0.6,-5.5 4.9,-6.6v16.4c0,24.5 0,49 -0.1,73.5 0,4.7 0.6,7.5 6.5,7.5 6.1,0 6.4,-3.1 6.3,-7.7 -0.1,-32.3 0,-64.6 -0.1,-96.9 0,-2.5 1.2,-5.5 -1.9,-7.3 -7.1,-4.1 -21.2,1.1 -23.8,8.8 -9.1,27.2 -18.2,54.4 -27.3,81.7zM161,673.2c0.1,0 0.1,0 0,0 0,16 0.1,31.9 0,47.9 0,4.2 -0.6,7.9 5.9,7.9 5.9,-0.1 6.6,-2.7 6.5,-7.5 -0.2,-12.2 0.2,-24.5 -0.2,-36.7 -0.2,-5.5 1.7,-7 7,-6.9 14.3,0.3 28.6,0.5 42.8,-0.1 6.9,-0.3 7.7,2.6 7.6,8.4 -0.4,11.9 0,23.8 -0.1,35.7 0,4.1 0.1,7.1 5.8,7.1s6.6,-2.3 6.6,-7.3c-0.2,-32.6 -0.2,-65.2 0,-97.8 0,-5.1 -1.2,-7.3 -6.7,-7.3 -5.7,0 -5.7,3.1 -5.7,7.1 0.1,11.9 -0.2,23.8 0.2,35.7 0.2,5.9 -1.8,7.6 -7.6,7.5 -14.3,-0.3 -28.5,-0.3 -42.8,0 -5.3,0.1 -7.1,-1.7 -7,-7 0.3,-11.9 0,-23.8 0.2,-35.7 0.1,-4.7 -0.5,-7.5 -6.5,-7.6 -6.4,-0.1 -6,3.5 -6,7.8 0.1,16.2 0,32.5 0,48.8zM266.7,671.9c0,17 0.1,33.9 -0.1,50.9 0,4.2 1.2,6.2 5.8,6.1 4.4,-0.1 7.1,-0.8 6.8,-6.1 -0.3,-6.4 0.5,-13 -0.2,-19.3 -1.1,-9.8 1.6,-14.9 12.5,-12.9 3.6,0.7 7.4,0.1 11.2,0.1 30.7,-0.1 43.3,-14 40.3,-44.4 -1.8,-18.3 -11.8,-28.4 -30.2,-29.3 -12.9,-0.6 -25.8,0 -38.7,-0.5 -5.9,-0.2 -7.6,1.9 -7.4,7.5 0.2,16 0,32 0,47.9zM69.3,672.7c0,16.6 0.1,33.3 -0.1,49.9 -0.1,5 2,6.4 6.6,6.3 4.4,0 6.3,-1.4 5.9,-5.9 -0.2,-2.4 0,-4.7 0,-7.1 0,-25.1 0,-25.1 25.2,-25.2 28.2,-0.1 39.4,-11.7 38.7,-40 -0.6,-22.7 -11.2,-33.4 -34.1,-33.9 -10.9,-0.3 -21.7,0.4 -32.6,-0.3 -7.3,-0.4 -10.1,1.4 -9.8,9.3 0.7,15.7 0.2,31.3 0.2,46.9zM545.5,688.5h-0.1c0,-6.5 0.2,-12.9 0,-19.3 -0.6,-13.9 -7.3,-21.2 -21,-22.9 -9.9,-1.2 -19.6,0.7 -29.4,2.1 -3.4,0.5 -7.8,0.5 -6.9,6.4 0.9,5.8 4.9,3.3 7.8,3.2 8.5,-0.2 17,-1 25.4,-0.8 9.8,0.2 11.8,7.2 12.2,15.5 0.5,9.3 -6.4,6.8 -11.2,7.5 -6.7,1 -13.6,1.1 -20.2,2.4 -11.6,2.2 -17.5,8.8 -18.5,19.8 -1.8,19.5 8.3,29.5 27.9,27.6 12.3,-1.2 24.5,-8.1 37,-0.4 1.7,1 5,1.6 6,-1.6 0.8,-2.8 1.6,-6.4 -2.4,-7.8 -6.8,-2.3 -6.7,-7.7 -6.6,-13.3 0.1,-6.2 0,-12.3 0,-18.4zM665.8,693.1h9.2c19.3,0 20.3,-1.2 17.1,-20.6 -2.8,-16.8 -12.3,-25.3 -29.8,-26.5 -16.4,-1.1 -28.8,7 -33.1,22.6 -3.9,14 -3.5,28.3 0.4,42.3 3,10.8 10.2,17.2 21.7,18.7 11.3,1.5 22.4,-0.4 33.5,-1.1 3.5,-0.2 5.6,-1.7 5.4,-5.8 -0.3,-4.8 -3.6,-4 -6.6,-4 -8.1,0.1 -16.3,0.7 -24.4,0.5 -12.1,-0.3 -18.1,-6 -19.7,-17.6 -0.8,-5.7 0.1,-9.1 7.1,-8.5 6.2,0.5 12.7,0 19.2,0zM598,669.6v52c0,3.9 -0.5,7.2 5.5,7.3 5.8,0 6.7,-2.5 6.7,-7.4 -0.1,-34 -0.2,-68 0,-102 0,-5.1 -1.2,-7.1 -6.8,-7.2 -6,0 -5.4,3.5 -5.4,7.3 -0.1,16.7 -0.1,33.4 0,50zM748.6,646.4c-8.1,1.3 -15.3,4.5 -22.4,8.5 -3.5,2 -6.5,2.9 -6.4,-3 0.1,-5.7 -4.1,-4 -7.2,-4.3 -4.7,-0.5 -4.6,2.7 -4.6,5.9 0,23.1 0.1,46.2 0,69.3 0,4 0.6,6.3 5.5,6.2 4.6,-0.1 6.8,-1.2 6.7,-6.3 -0.3,-11.5 0,-23.1 -0.1,-34.6 0,-21.2 -0.2,-21.7 20.8,-27.4 8.7,-2.4 10,-6.5 7.7,-14.3zM577.7,688.8c0,-11.5 -0.1,-23 0.1,-34.5 0.1,-4.4 -0.8,-6.9 -6,-6.9 -5,0 -6.3,1.8 -6.2,6.5 0.2,22.7 0.2,45.3 0,68 0,4.3 0.4,7 5.9,7 5,0 6.4,-1.9 6.3,-6.6 -0.3,-11.1 -0.2,-22.3 -0.1,-33.5zM577.6,622.7c0.7,-4.9 -0.5,-7.6 -6.4,-7.6 -5.7,0 -5.8,3 -5.8,7.1 0.1,3.8 -0.8,7.5 5.3,7.4 5.2,-0.1 7.9,-1.4 6.9,-6.9z"
android:fillColor="#343333"/>
<path
android:pathData="m391.9,170.7c15.4,14.3 29.6,27.3 43.7,40.5 42.3,39.4 84.6,78.7 126.6,118.4 5.9,5.6 9.4,6.1 15.5,0.3 42.8,-40.4 85.9,-80.4 128.9,-120.4 13.5,-12.6 27.1,-25.1 40.7,-37.8 3,3 1.9,5.8 1.9,8.3 0.1,113.6 0,227.1 0.2,340.7 0,8.1 -1.6,11 -10.5,11 -112.6,-0.3 -225.1,-0.2 -337.7,-0.1 -6.6,0 -10.6,-0.2 -10.5,-8.9 0.3,-115.6 0.2,-231.2 0.2,-346.8 0.1,-0.9 0.4,-1.8 1,-5.2z"
android:fillColor="#f8cc6e"/>
<path
android:pathData="m69.3,302.7c0,-72.5 0.2,-144.9 -0.2,-217.4 -0.1,-9.3 2.6,-11.2 11.4,-11 42.2,0.9 84.3,-0.8 126.5,1.3 54.5,2.6 96.5,26.4 119.9,76.1 24,51 19.1,101.1 -14.3,147.5 -25.8,35.9 -62.2,51.5 -105.1,53.7 -19,1 -38.1,1.2 -57.1,0.3 -10.4,-0.5 -12,3.1 -11.9,12.5 0.5,52 0,104.1 0.4,156.1 0.1,8.1 -2.2,10.4 -10.2,10.1 -16.6,-0.6 -33.3,-0.6 -50,0 -8.1,0.3 -9.4,-2.6 -9.4,-9.9 0.1,-73.1 0,-146.2 0,-219.3zM138.6,213.9c0,22.1 0.2,44.2 -0.1,66.3 -0.1,6.4 1.9,8.2 8.1,7.9 10.5,-0.5 21.1,-0.2 31.6,-0.1 14.6,0.2 29.3,0 43.5,-4 37.4,-10.6 58.3,-53.5 47,-95.9 -7.1,-26.4 -32,-45.4 -63.5,-47.2 -19.3,-1.1 -38.8,-0.3 -58.1,-0.9 -6.7,-0.2 -8.8,1.8 -8.6,8.5 0.3,21.9 0.1,43.6 0.1,65.4z"
android:fillColor="#fefefe"/>
<path
android:pathData="m746.4,75.3c-0.2,3.8 -3.3,5.3 -5.4,7.2 -53.8,50.4 -107.9,100.6 -161.5,151.2 -7.5,7.1 -11.5,6.2 -18.6,-0.5 -53.9,-50.8 -108.2,-101.2 -162.5,-151.7 -1.7,-1.6 -3.8,-2.7 -4.6,-6.2z"
android:fillColor="#f8cc6e"/>
<path
android:pathData="m413.9,707.5c9.1,-27.2 18.3,-54.5 27.4,-81.7 2.6,-7.6 16.7,-12.9 23.8,-8.8 3.1,1.8 1.9,4.8 1.9,7.3 0.1,32.3 0,64.6 0.1,96.9 0,4.6 -0.3,7.7 -6.3,7.7s-6.6,-2.8 -6.5,-7.5c0.1,-24.5 0.1,-49 0.1,-73.5v-16.4c-4.4,1 -4.1,4.2 -4.9,6.6 -9,26 -18,52 -26.8,78.1 -1.7,5 -3.1,8.7 -10.1,8.8 -7.5,0.1 -8.2,-4.4 -9.8,-9.2 -8.7,-25.4 -17.5,-50.8 -26.2,-76.1 -0.9,-2.7 -2,-5.5 -3.4,-9.2 -2.9,3.7 -2,6.8 -2,9.5 -0.1,26.9 -0.1,53.7 0,80.6 0,4.8 0,8.5 -6.7,8.4 -6.3,-0.1 -6,-3.8 -6,-8 0,-32.3 0.1,-64.6 -0.1,-96.9 0,-5.9 2.1,-7 7.6,-7.6 11.1,-1.2 16.7,2 20,13.6 7.5,26 16.9,51.5 25.5,77.3 0.7,0 1.5,0 2.4,0.1zM161,673.2v-48.9c0,-4.3 -0.4,-7.9 6,-7.8 6,0.1 6.5,2.9 6.5,7.6 -0.2,11.9 0.2,23.8 -0.2,35.7 -0.1,5.3 1.7,7.1 7,7 14.3,-0.3 28.5,-0.3 42.8,0 5.7,0.1 7.8,-1.6 7.6,-7.5 -0.4,-11.9 -0.1,-23.8 -0.2,-35.7 0,-4 -0.1,-7.2 5.7,-7.1 5.6,0 6.8,2.2 6.7,7.3 -0.2,32.6 -0.2,65.2 0,97.8 0,5 -0.9,7.4 -6.6,7.3 -5.7,0 -5.8,-3 -5.8,-7.1 0.1,-11.9 -0.2,-23.8 0.1,-35.7 0.2,-5.7 -0.7,-8.6 -7.6,-8.4 -14.2,0.6 -28.5,0.4 -42.8,0.1 -5.2,-0.1 -7.1,1.4 -7,6.9 0.4,12.2 0,24.5 0.2,36.7 0.1,4.8 -0.7,7.5 -6.5,7.5 -6.5,0.1 -5.9,-3.6 -5.9,-7.9 0.1,-15.9 0.1,-31.8 0,-47.8 0.1,0 0.1,0 0,0zM266.7,671.9c0,-15.9 0.2,-31.9 -0.1,-47.8 -0.1,-5.7 1.6,-7.7 7.4,-7.5 12.9,0.5 25.8,-0.2 38.7,0.5 18.4,0.9 28.4,11 30.2,29.3 3,30.4 -9.6,44.3 -40.3,44.4 -3.7,0 -7.6,0.6 -11.2,-0.1 -10.9,-2 -13.6,3 -12.5,12.9 0.7,6.4 -0.1,12.9 0.2,19.3 0.3,5.3 -2.4,6 -6.8,6.1 -4.6,0.1 -5.8,-1.9 -5.8,-6.1 0.3,-17 0.2,-34 0.2,-51zM279.1,654c0,26.6 0,26.6 26.7,25.9 16.9,-0.4 24.7,-8.8 24.8,-26.7 0.1,-17.6 -7,-25.1 -24.2,-25.7 -27.2,-0.9 -27.2,-0.9 -27.3,26.5zM69.3,672.7c0,-15.6 0.5,-31.2 -0.2,-46.8 -0.3,-8 2.5,-9.8 9.8,-9.3 10.8,0.6 21.7,0 32.6,0.3 22.9,0.6 33.5,11.2 34.1,33.9 0.8,28.2 -10.5,39.9 -38.7,40 -25.2,0.1 -25.2,0.1 -25.2,25.2 0,2.4 -0.2,4.8 0,7.1 0.4,4.5 -1.5,5.9 -5.9,5.9 -4.7,0.1 -6.7,-1.3 -6.6,-6.3 0.2,-16.7 0.1,-33.4 0.1,-50zM81.7,653.4v1c0,25.9 0,25.9 25.8,25.5 17.7,-0.3 25.4,-8.3 25.5,-26.7 0.1,-18.3 -6.7,-25.3 -24.9,-25.7 -26.4,-0.6 -26.4,-0.6 -26.4,25.9zM545.5,688.5c0,6.1 0.1,12.2 0,18.3 -0.1,5.6 -0.2,11 6.6,13.3 4,1.3 3.2,4.9 2.4,7.8 -0.9,3.2 -4.3,2.6 -6,1.6 -12.5,-7.7 -24.7,-0.8 -37,0.4 -19.6,1.9 -29.7,-8.1 -27.9,-27.6 1,-11 6.9,-17.6 18.5,-19.8 6.7,-1.3 13.5,-1.4 20.2,-2.4 4.8,-0.7 11.7,1.8 11.2,-7.5 -0.4,-8.3 -2.4,-15.2 -12.2,-15.5 -8.5,-0.2 -17,0.6 -25.4,0.8 -2.9,0.1 -6.9,2.6 -7.8,-3.2 -0.9,-5.9 3.5,-5.8 6.9,-6.4 9.7,-1.4 19.5,-3.3 29.4,-2.1 13.8,1.7 20.4,8.9 21,22.9 0.3,6.4 0,12.9 0,19.3zM533.5,702.5c0,-14.4 0,-14.4 -13.6,-12.8 -4.7,0.5 -9.5,0.6 -14.1,1.6 -5.9,1.3 -9.3,5.4 -9.7,11.4 -0.4,5.8 -0.6,12.6 5.3,15.3 9.5,4.3 19.4,1.5 28.6,-1.9 6.9,-2.7 1.9,-9.7 3.5,-13.6zM665.8,693.1c-6.5,0 -12.9,0.4 -19.3,-0.1 -7,-0.6 -7.9,2.8 -7.1,8.5 1.6,11.6 7.6,17.3 19.7,17.6 8.1,0.2 16.3,-0.3 24.4,-0.5 3,-0.1 6.3,-0.8 6.6,4 0.2,4.1 -1.9,5.5 -5.4,5.8 -11.2,0.7 -22.2,2.6 -33.5,1.1 -11.5,-1.5 -18.7,-7.9 -21.7,-18.7 -3.9,-14 -4.3,-28.2 -0.4,-42.3 4.3,-15.6 16.7,-23.7 33.1,-22.6 17.5,1.2 27,9.7 29.8,26.5 3.2,19.4 2.2,20.6 -17.1,20.6 -3,0.1 -6.1,0.1 -9.1,0.1zM660.3,656.3c-12.5,0.1 -20.7,8.3 -21.3,21 -0.2,4.1 0.5,6.4 5.2,6.3 10.5,-0.2 20.9,-0.1 31.4,0 3.3,0 4.6,-1.3 4.9,-4.8 1,-13.2 -7.3,-22.6 -20.2,-22.5zM597.9,669.6v-50c0,-3.8 -0.6,-7.3 5.4,-7.3 5.5,0 6.8,2 6.8,7.2 -0.2,34 -0.2,68 0,102 0,4.9 -0.9,7.4 -6.7,7.4 -5.9,0 -5.5,-3.4 -5.5,-7.3 0.1,-17.3 0.1,-34.6 0,-52zM748.6,646.4c2.3,7.8 1,11.8 -7.6,14.2 -21,5.6 -20.8,6.2 -20.8,27.4 0,11.5 -0.2,23.1 0.1,34.6 0.1,5.1 -2.2,6.2 -6.7,6.3 -4.8,0.1 -5.5,-2.2 -5.5,-6.2 0.1,-23.1 0.1,-46.2 0,-69.3 0,-3.2 -0.2,-6.4 4.6,-5.9 3.1,0.3 7.4,-1.3 7.2,4.3 -0.2,5.9 2.9,5 6.4,3 6.9,-3.9 14.2,-7.1 22.3,-8.4zM577.6,688.8c0,11.2 -0.2,22.3 0.1,33.5 0.1,4.7 -1.3,6.6 -6.3,6.6 -5.5,0.1 -5.9,-2.7 -5.9,-7 0.1,-22.7 0.1,-45.3 0,-68 0,-4.7 1.2,-6.5 6.2,-6.5 5.3,0 6.1,2.5 6,6.9 -0.2,11.5 0,23 -0.1,34.5zM577.6,622.7c1.1,5.6 -1.7,6.8 -6.8,6.9 -6.1,0.1 -5.2,-3.6 -5.3,-7.4 -0.1,-4.1 0.1,-7.1 5.8,-7.1 5.8,-0.1 7,2.6 6.3,7.6z"
android:fillColor="#fefefe"/>
<path
android:pathData="m138.6,213.9c0,-21.8 0.2,-43.5 -0.1,-65.3 -0.1,-6.7 1.9,-8.8 8.6,-8.5 19.4,0.6 38.8,-0.1 58.1,0.9 31.5,1.7 56.5,20.8 63.5,47.2 11.3,42.4 -9.6,85.3 -47,95.9 -14.2,4 -28.8,4.2 -43.5,4 -10.5,-0.1 -21.1,-0.4 -31.6,0.1 -6.2,0.3 -8.2,-1.6 -8.1,-7.9 0.3,-22.2 0.1,-44.3 0.1,-66.4zM279.1,654c0,-27.4 0,-27.4 27.2,-26.5 17.3,0.6 24.3,8.1 24.2,25.7 -0.1,17.9 -7.9,26.3 -24.8,26.7 -26.6,0.7 -26.6,0.7 -26.6,-25.9zM81.7,653.4c0,-26.5 0,-26.5 26.4,-25.9 18.1,0.4 25,7.5 24.9,25.7 -0.1,18.4 -7.8,26.4 -25.5,26.7 -25.8,0.4 -25.8,0.4 -25.8,-25.5zM533.5,702.5c0,4.2 0.6,12.2 -3.6,13.6 -9.3,3.1 -19.1,6.3 -28.6,1.9 -5.9,-2.7 -5.7,-9.5 -5.3,-15.3 0.4,-6.1 3.8,-10.2 9.7,-11.4 4.6,-1 9.4,-1.1 14.1,-1.6 13.7,-1.6 13.7,-1.6 13.7,12.8zM660.3,656.3c12.9,-0.1 21.2,9.3 20.3,22.5 -0.3,3.5 -1.6,4.8 -4.9,4.8 -10.5,0 -20.9,-0.1 -31.4,0 -4.8,0.1 -5.4,-2.3 -5.2,-6.3 0.5,-12.7 8.6,-20.9 21.2,-21z"
android:fillColor="#343333"/>
</vector>

View File

@ -1813,6 +1813,7 @@
<string name="infra_mailjet" translatable="false">Mailjet</string>
<string name="infra_mandrill" translatable="false">Mandrill</string>
<string name="infra_netcore" translatable="false">Pepipost/netcore</string>
<string name="infra_phpmailer" translatable="false">PHPMailer</string>
<string name="infra_postmark" translatable="false">Postmark</string>
<string name="infra_salesforce" translatable="false">Salesforce</string>
<string name="infra_sendgrid" translatable="false">SendGrid</string>