From 2e86dd528354a8267521e045a185f920683e4724 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 26 Apr 2016 02:01:45 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/sites/templates/web_vhost_domain_edit.htm | 2 +-
server/plugins-available/nginx_plugin.inc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 95e97e7..ec9005a 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -74,7 +74,7 @@
{tmpl_var name='ip_address'}
</select></div>
</div>
- <div class="form-group" style="display:none">
+ <div class="form-group">
<label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
<div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
{tmpl_var name='ipv6_address'}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 0b0550a..2a49504 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -745,7 +745,7 @@
$file_system = explode(" ", $df_output)[0];
$primitive_root = explode(" ", $df_output)[1];
- if ( $file_system , array('ext2','ext3','ext4') ) {
+ if ( in_array($file_system , array('ext2','ext3','ext4'), true) ) {
exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
} elseif ($file_system == 'xfs') {
--
Gitblit v1.9.1