From 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 17 Mar 2016 07:30:11 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/admin/form/server_config.tform.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 7e37550..c17baf8 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -170,7 +170,7 @@
 			'formtype' => 'TEXT',
 			'default' => '/var/backup',
 			'validators' => array(	0 => array ( 	'type' => 'REGEX',
-										'regex' => '/^\/[a-zA-Z0-9\.\-\_\/]{5,128}$/',
+										'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/";
 										'errmsg'=> 'backup_dir_error_regex'),
 			),
 			'value' => '',

--
Gitblit v1.9.1