Commit e146fe8c authored by Marius Cramer's avatar Marius Cramer

Merge branch 'master' into 'master'

Master

See merge request !173
parents cab4ba3a d9bc8927
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'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' => '',
......
......@@ -156,6 +156,7 @@ class backup_plugin {
}
}
}
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 @@ class backup_plugin {
}
}
}
if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
} else {
$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
}
......
......@@ -75,9 +75,9 @@ class mail_plugin_dkim {
*/
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='';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment