Merge pull request #4966 from meuhland/meuhland-add-dkim-passphrase

Add support for passphrase for DKIM private key

Author: ywarnier

app/config/mail.conf.dist.php

@@ -40,6 +40,7 @@
 $platform_email['DKIM_DOMAIN'] = 'mydomain.com'; //the domain for e-mail sending, not necessarily api_get_path(WEB_PATH)
 $platform_email['DKIM_PRIVATE_KEY_STRING'] = ''; //the private key in a string format
 $platform_email['DKIM_PRIVATE_KEY'] = ''; //the private key as the path to a file. The file needs to be accessible to PHP!
+$platform_email['DKIM_PASSPHRASE'] = ''; //the passohrase for the private key defined in the last 2 lines
 // Some e-mail clients do not understand the descriptive LD+JSON format,
 // showing it as a loose JSON string to the final user. If this is your case,
 // you might want to set the variable below to 'false' to disable this header.

main/inc/lib/api.lib.php

@@ -9775,6 +9775,9 @@ function api_mail_html(
         }
         $mail->DKIM_private_string = api_get_mail_configuration_value('DKIM_PRIVATE_KEY_STRING');
         $mail->DKIM_private = api_get_mail_configuration_value('DKIM_PRIVATE_KEY');
+        if (!empty(api_get_mail_configuration_value['DKIM_PASSPHRASE'])) {
+            $mail->DKIM_passphrase = api_get_mail_configuration_value['DKIM_PASSPHRASE'];
+        }
     }
 
     // Send the mail message.