Merge branch 'master' into 'stable-3.1'

Fixes: #3846



See merge request !325

Author: Till Brehm

interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -74,7 +74,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     {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'}

server/plugins-available/nginx_plugin.inc.php

@@ -745,7 +745,7 @@ function update($event_name, $data) {
           $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') {