@@ -340,15 +340,15 @@ function update($event_name, $data) {
340340 foreach ($ options as $ key => $ value ) {
341341 $ value = trim ($ value );
342342 if ($ value == '' ) continue ;
343- if (preg_match ("|check_recipient_access\s+proxy:mysql: $ { quoted_postfix_config_dir}/mysql-verify_recipients.cf| " , $ value )) {
343+ if (preg_match ("|check_recipient_access\s+proxy:mysql: { $ quoted_postfix_config_dir }/mysql-verify_recipients.cf| " , $ value )) {
344344 continue ;
345345 }
346346 $ new_options [] = $ value ;
347347 }
348348 if (isset ($ configure_lmtp ) && $ configure_lmtp && $ mail_config ['content_filter ' ] == 'amavisd ' ) {
349349 for ($ i = 0 ; isset ($ new_options [$ i ]); $ i ++) {
350350 if ($ new_options [$ i ] == 'reject_unlisted_recipient ' ) {
351- array_splice ($ new_options , $ i +1 , 0 , array ("check_recipient_access proxy:mysql: $ { quoted_postfix_config_dir}/mysql-verify_recipients.cf " ));
351+ array_splice ($ new_options , $ i +1 , 0 , array ("check_recipient_access proxy:mysql: { $ quoted_postfix_config_dir }/mysql-verify_recipients.cf " ));
352352
353353 $ app ->system ->exec_safe ("postconf -e ? " , 'address_verify_virtual_transport = smtp:[127.0.0.1]:10025 ' );
354354 $ app ->system ->exec_safe ("postconf -e ? " , 'address_verify_transport_maps = static:smtp:[127.0.0.1]:10025 ' );
@@ -378,7 +378,7 @@ function update($event_name, $data) {
378378 exec ("postconf -e 'milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}' " );
379379 exec ("postconf -e 'milter_default_action = accept' " );
380380
381- exec ("postconf -e 'smtpd_sender_restrictions = $ { raslm} permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, $ { rslm} permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender' " );
381+ exec ("postconf -e 'smtpd_sender_restrictions = { $ raslm } permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, { $ rslm } permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender' " );
382382
383383 $ new_options = array ();
384384 $ options = preg_split ("/,\s*/ " , exec ("postconf -h smtpd_recipient_restrictions " ));
@@ -388,7 +388,7 @@ function update($event_name, $data) {
388388 if (preg_match ('/check_policy_service\s+inet:127.0.0.1:10023/ ' , $ value )) {
389389 continue ;
390390 }
391- if (preg_match ("|check_recipient_access\s+proxy:mysql: $ { quoted_postfix_config_dir}/mysql-verify_recipients.cf| " , $ value )) {
391+ if (preg_match ("|check_recipient_access\s+proxy:mysql: { $ quoted_postfix_config_dir }/mysql-verify_recipients.cf| " , $ value )) {
392392 continue ;
393393 }
394394 $ new_options [] = $ value ;
@@ -420,7 +420,7 @@ function update($event_name, $data) {
420420 exec ("postconf -e 'content_filter = " . ($ configure_lmtp ? "lmtp " : "amavis " ) . ":[127.0.0.1]:10024' " );
421421
422422 // fixme: should read this from conf templates
423- exec ("postconf -e 'smtpd_sender_restrictions = $ { raslm} check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, $ { rslm} permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:/etc/postfix/tag_as_foreign.re' " );
423+ exec ("postconf -e 'smtpd_sender_restrictions = { $ raslm } check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, { $ rslm } permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:/etc/postfix/tag_as_foreign.re' " );
424424 }
425425
426426 if ($ mail_config ['content_filter ' ] == 'rspamd ' && ($ mail_config ['rspamd_password ' ] != $ old_ini_data ['mail ' ]['rspamd_password ' ] || $ mail_config ['content_filter ' ] != $ old_ini_data ['mail ' ]['content_filter ' ])) {
0 commit comments