From 8100f25edc779ee5f1b2ca7de0cd25f38e4f5343 Mon Sep 17 00:00:00 2001 From: floria030 Date: Wed, 5 Feb 2014 14:48:04 +0100 Subject: [PATCH] use regex for dkim-integration in distribution-specific files, too --- install/dist/lib/centos52.lib.php | 10 +++++----- install/dist/lib/centos53.lib.php | 10 +++++----- install/dist/lib/fedora.lib.php | 10 +++++----- install/dist/lib/gentoo.lib.php | 6 +++--- install/dist/lib/opensuse.lib.php | 20 ++++++++++++++++---- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/install/dist/lib/centos52.lib.php b/install/dist/lib/centos52.lib.php index 7b6afb95e8..7f8901b1af 100644 --- a/install/dist/lib/centos52.lib.php +++ b/install/dist/lib/centos52.lib.php @@ -144,21 +144,21 @@ class installer extends installer_dist { if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~'); $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before - if(!stristr($content, 'amavis')) { + if(!preg_match('/^amavis\s+/m', $content)) { unset($content); $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10025')) { + if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10027')) { + if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); } unset($content); diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php index 49e77ff87f..ee586f78d5 100644 --- a/install/dist/lib/centos53.lib.php +++ b/install/dist/lib/centos53.lib.php @@ -145,21 +145,21 @@ class installer extends installer_dist { if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~'); $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before - if(!stristr($content, 'amavis')) { + if(!preg_match('/^amavis\s+/m', $content)) { unset($content); $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10025')) { + if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10027')) { + if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); } unset($content); diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 0b4b3e935f..bbcdfa68fa 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -500,21 +500,21 @@ class installer_dist extends installer_base { if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~'); $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before - if(!stristr($content, 'amavis')) { + if(!preg_match('/^amavis\s+/m', $content)) { unset($content); $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10025')) { + if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10027')) { + if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master'); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); af($conf['postfix']['config_dir'].'/master.cf', $content); } unset($content); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 8c98140b1c..e7aac8c61f 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -335,19 +335,19 @@ class installer extends installer_base // Append the configuration for amavisd to the master.cf file $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before - if(!stristr($content, 'amavis')) { + if(!preg_match('/^amavis\s+/m', $content)) { unset($content); $content = $this->get_template_file('master_cf_amavis', true); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10025')) { + if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { unset($content); $content = $this->get_template_file('master_cf_amavis10025', true); af($conf['postfix']['config_dir'].'/master.cf', $content); $content = rf($conf['postfix']['config_dir'].'/master.cf'); } - if(!stristr($content, '127.0.0.1:10027')) { + if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { unset($content); $content = $this->get_template_file('master_cf_amavis10027', true); af($conf['postfix']['config_dir'].'/master.cf', $content); diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 9ec6bcf471..a052615e43 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -533,11 +533,23 @@ class installer_dist extends installer_base { // Append the configuration for amavisd to the master.cf file if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf', $conf["postfix"]["config_dir"].'/master.cf~'); $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - // Only add the content if we had not addded it before - if(!stristr($content, "127.0.0.1:10025")) { + // Only add the content if we had not addded it before + if(!preg_match('/^amavis\s+/m', $content)) { + unset($content); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); + af($conf['postfix']['config_dir'].'/master.cf', $content); + $content = rf($conf['postfix']['config_dir'].'/master.cf'); + } + if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { + unset($content); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); + af($conf['postfix']['config_dir'].'/master.cf', $content); + $content = rf($conf['postfix']['config_dir'].'/master.cf'); + } + if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { unset($content); - $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', "tpl/master_cf_amavis.master"); - af($conf["postfix"]["config_dir"].'/master.cf', $content); + $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); + af($conf['postfix']['config_dir'].'/master.cf', $content); } unset($content); -- GitLab