Commit 212e4d0e authored by Till Brehm's avatar Till Brehm

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 6de0b750 4cffaf92
......@@ -190,7 +190,7 @@ $do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in
if($do_backup == 'yes') {
//* Create the backup directory
$backup_path = '/var/backup/ispconfig_'.@date('Y-m-d_H-i');
$backup_path = '/var/backup/ispconfig_'.$conf['hostname'].'_'.@date('Y-m-d_H-i');
$conf['backup_path'] = $backup_path;
exec("mkdir -p $backup_path");
exec("chown root:root $backup_path");
......
......@@ -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' => '',
......
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