From e146fe8cebdf9201ccd67b37333a6c423ac5c1f4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 31 Mar 2015 05:36:24 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/dns/form/dns_cname.tform.php | 2 +-
server/plugins-available/mail_plugin_dkim.inc.php | 2 +-
server/plugins-available/backup_plugin.inc.php | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index ca2419b..957e6e1 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -86,7 +86,7 @@
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-\*\_]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 3c3531c..5b46930 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -156,6 +156,7 @@
}
}
}
+ if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
} else {
$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
}
@@ -227,6 +228,7 @@
}
}
}
+ if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
} else {
$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
}
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 7fea83c..2842551 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -75,9 +75,9 @@
*/
function get_amavis_config() {
$pos_config=array(
- '/etc/amavisd.conf',
'/etc/amavisd.conf/50-user',
'/etc/amavis/conf.d/50-user',
+ '/etc/amavisd.conf',
'/etc/amavisd/amavisd.conf'
);
$amavis_configfile='';
--
Gitblit v1.9.1