diff options
Diffstat (limited to 'inc')
-rw-r--r-- | inc/defaultdata.inc.php | 6 | ||||
-rw-r--r-- | inc/message.inc.php | 2 |
2 files changed, 4 insertions, 4 deletions
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', diff --git a/inc/message.inc.php b/inc/message.inc.php index 0e054846..2fccb0a0 100644 --- a/inc/message.inc.php +++ b/inc/message.inc.php @@ -65,7 +65,6 @@ class Message return; } // Non-Ajax - if (!self::$flushed) Render::openTag('div', array('class' => 'container')); foreach (self::$list as $item) { $message = Dictionary::getMessage($item['id']); foreach ($item['params'] as $index => $text) { @@ -74,7 +73,6 @@ class Message Render::addTemplate('messagebox-' . $item['type'], array('message' => $message)); self::$alreadyDisplayed[] = $item; } - if (!self::$flushed) Render::closeTag('div'); self::$list = array(); self::$flushed = true; } |