From 8434cd9505a9672743908076896e417eddc47693 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 19 Nov 2014 19:46:19 +0100
Subject: Several minor fixes

- Removed common share setting for now (until properly supported)
- Remove extra container div in message display
- Support multiline translation strings
- Add "next" button on top of file list when creating custom config module
---
 inc/defaultdata.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'inc/defaultdata.inc.php')

diff --git a/inc/defaultdata.inc.php b/inc/defaultdata.inc.php
index fd3b3d92..c31d4ae4 100644
--- a/inc/defaultdata.inc.php
+++ b/inc/defaultdata.inc.php
@@ -24,7 +24,7 @@ class DefaultData
 			2 => 20, // Internet access
 			3 => 100, // Timesync
 			4 => 10, // System config
-			5 => 15, // Public Shared folder
+			//5 => 15, // Public Shared folder
 			6 => 20000, // Unassigned/no category
 		);
 		foreach ($cats as $cat => $sort) {
@@ -109,7 +109,7 @@ class DefaultData
 				'catid' => '2',
 				'defaultvalue' => 'socks5',
 				'permissions' => '2',
-				'validator' => ''
+				'validator' => 'list:socks4|socks5|http-connect|http-relay'
 			),
 			array(
 				'setting' => 'SLX_REMOTE_LOG_SESSIONS',
@@ -139,6 +139,7 @@ class DefaultData
 				'permissions' => '2',
 				'validator' => 'regex:/^\d*$/'
 			),
+			/*
 			array(
 				'setting' => 'SLX_COMMON_SHARE_PATH',
 				'catid' => '5',
@@ -153,6 +154,7 @@ class DefaultData
 				'permissions' => '2',
 				'validator' => 'list:guest|user'
 			),
+			*/
 			array(
 				'setting' => 'SLX_BENCHMARK_VM',
 				'catid' => '6',
-- 
cgit v1.2.3-55-g7522