From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/templates/server_config_web_edit.htm |  568 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 358 insertions(+), 210 deletions(-)

diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 9f60b74..372a752 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -1,216 +1,364 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_server_config">
-  
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-		<div class="ctrlHolder">
-				<p class="label">{tmpl_var name='server_type_txt'}</p>
-					<div class="multiField">
-						<select name="server_type" id="server_type" class="selectInput">
-					{tmpl_var name='server_type'}
-				</select>
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
-        <input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-	  <div class="ctrlHolder">
-      	<label for="website_path">{tmpl_var name='website_path_txt'}</label>
-        <input name="website_path" id="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="website_symlinks">{tmpl_var name='website_symlinks_txt'}</label>
-        <input name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-      <div class="ctrlHolder">
-      	<label for="website_symlinks_rel">{tmpl_var name='website_symlinks_rel_txt'}</label>
-			<div class="multiField">
-				{tmpl_var name='website_symlinks_rel'}
-			</div>
-	  </div>
-      <div class="ctrlHolder apache">
-      	<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
-        <input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder apache">
-      	<label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
-        <input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-	<div class="ctrlHolder nginx">
-      	<label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
-        <input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder nginx">
-      	<label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
-        <input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
-        <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
-        <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
-			</div>
-	  <div class="ctrlHolder apache">
-				<p class="label">{tmpl_var name='security_level_txt'}</p>
-					<div class="multiField">
-						<select name="security_level" id="security_level" class="selectInput">
-					{tmpl_var name='security_level'}
-				</select>
-					</div>
-			</div>
-	  <div class="ctrlHolder apache">
-				<p class="label">{tmpl_var name='check_apache_config_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='check_apache_config'}
-					</div>
-			</div>
-	  <div class="ctrlHolder apache">
-      	<label for="user">{tmpl_var name='web_user_txt'}</label>
-        <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-	  <div class="ctrlHolder apache">
-      	<label for="group">{tmpl_var name='web_group_txt'}</label>
-        <input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
-        <input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
-			</div>
-	  <div class="ctrlHolder nginx">
-      	<label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
-        <input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder apache">
-      	<label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
-        <input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
-        <input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
-        <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="php_fpm_ini_path">{tmpl_var name='php_fpm_ini_path_txt'}</label>
-        <input name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
-        <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
-        <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
-        <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder nginx">
-      	<label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
-        <input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder apache">
-      	<label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
-        <input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="apps_vhost_port">{tmpl_var name='apps_vhost_port_txt'}</label>
-        <input name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="apps_vhost_ip">{tmpl_var name='apps_vhost_ip_txt'}</label>
-        <input name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
-        <input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
-        <input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="awstats_data_dir">{tmpl_var name='awstats_data_dir_txt'}</label>
-        <input name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="awstats_pl">{tmpl_var name='awstats_pl_txt'}</label>
-        <input name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-	  <div class="ctrlHolder">
-      	<label for="awstats_buildstaticpages_pl">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
-        <input name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" size="40" maxlength="255" type="text" class="textInput" />
-	  </div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingWeb">
+      <h4 class="panel-title">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseWeb" aria-expanded="true" aria-controls="collapseWeb">
+          {tmpl_var name='web_settings_txt'}
+        </a>
+      </h4>
     </div>
+    <div id="collapseWeb" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingWeb">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	  <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
+                <div class="col-sm-9">
+					<select name="server_type" id="server_type" class="form-control">
+                        {tmpl_var name='server_type'}
+                    </select>
+				</div>
+            </div>
+            <div class="form-group">
+                <label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label for="website_path" class="col-sm-3 control-label">{tmpl_var name='website_path_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="website_path" id="website_path" value="{tmpl_var name='website_path'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label for="website_symlinks" class="col-sm-3 control-label">{tmpl_var name='website_symlinks_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label for="website_symlinks_rel" class="col-sm-3 control-label">{tmpl_var name='website_symlinks_rel_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='website_symlinks_rel'}
+                </div>
+            </div>
+			<div class="form-group">
+                <label for="website_symlinks_rel" class="col-sm-3 control-label">{tmpl_var name='network_filesystem_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='network_filesystem'}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="website_autoalias" class="col-sm-3 control-label">{tmpl_var name='website_autoalias_txt'}</label>
+                <div class="col-sm-6"><input type="text" name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='website_autoalias_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
+            </div>
+		<div class="form-group apache">
+			<label for="vhost_rewrite_v6" class="col-sm-3 control-label">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
+			<div class="col-sm-9">
+				{tmpl_var name='vhost_rewrite_v6'}
+			</div>
+		</div>
+            <div class="form-group apache">
+                <label for="vhost_conf_dir" class="col-sm-3 control-label">{tmpl_var name='vhost_conf_dir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" class="form-control" /></div></div>
+            <div class="form-group apache">
+                <label for="vhost_conf_enabled_dir" class="col-sm-3 control-label">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" class="form-control" /></div></div>
+            <div class="form-group nginx">
+                <label for="nginx_vhost_conf_dir" class="col-sm-3 control-label">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" class="form-control" /></div></div>
+            <div class="form-group nginx">
+                <label for="nginx_vhost_conf_enabled_dir" class="col-sm-3 control-label">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='security_level_txt'}</label>
+                <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
+                        {tmpl_var name='security_level'}
+                    </select></div>
+            </div>
+            <div class="form-group apache">
+                <label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='check_apache_config'}
+                </div>
+            </div>
+            <div class="form-group apache">
+                <label for="user" class="col-sm-3 control-label">{tmpl_var name='web_user_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="user" id="user" value="{tmpl_var name='user'}" class="form-control" /></div></div>
+            <div class="form-group apache">
+                <label for="group" class="col-sm-3 control-label">{tmpl_var name='web_group_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="group" id="group" value="{tmpl_var name='group'}" class="form-control" /></div></div>
+            <div class="form-group nginx">
+                <label for="nginx_user" class="col-sm-3 control-label">{tmpl_var name='nginx_user_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" class="form-control" /></div></div>
+            <div class="form-group nginx">
+                <label for="nginx_group" class="col-sm-3 control-label">{tmpl_var name='nginx_group_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" class="form-control" /></div></div>
+            <div class="form-group nginx">
+                <label for="nginx_cgi_socket" class="col-sm-3 control-label">{tmpl_var name='nginx_cgi_socket_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" class="form-control" /></div></div>
+            <div class="form-group apache">
+                <label for="htaccess_allow_override" class="col-sm-3 control-label">{tmpl_var name='htaccess_allow_override_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='enable_ip_wildcard_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='enable_ip_wildcard'}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_admin_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='overtraffic_notify_admin'}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_client_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='overtraffic_notify_client'}
+                </div>
+            </div>
+			<div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_admin_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='overquota_notify_admin'}
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_client_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='overquota_notify_client'}
+                </div>
+            </div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_admin_txt'}</label>
+				<div class="col-sm-9">
+					{tmpl_var name='overquota_db_notify_admin'}
+				 </div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_client_txt'}</label>
+				<div class="col-sm-9">
+					{tmpl_var name='overquota_db_notify_client'}	
+				 </div>
+			</div>
+            <div class="form-group">
+                <label for="overquota_notify_freq" class="col-sm-3 control-label">{tmpl_var name='overquota_notify_freq_txt'}</label>
+                <div class="col-sm-6"><input type="text" name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
+            </div></div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_onok_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='overquota_notify_onok'}
+                </div>
+            </div>
+	  <!-- End content -->
+	  </div>
+	</div>
   </div>
-  
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingSSL">
+      <h4 class="panel-title">
+        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSSL" aria-expanded="false" aria-controls="collapseSSL">
+          {tmpl_var name='ssl_settings_txt'}
+        </a>
+      </h4>
+    </div>
+    <div id="collapseSSL" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSSL">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	                  <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='enable_sni_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='enable_sni'}
+                    </div>
+                </div>
+				<div class="form-group">
+					<label class="col-sm-3 control-label">
+						<tmpl_var name="enable_spdy_txt">
+					</label>
+					<div class="col-sm-9">
+						<tmpl_var name="enable_spdy">
+					</div>
+				</div>
+                <div class="form-group">
+                    <label for="CA_path" class="col-sm-3 control-label">{tmpl_var name='CA_path_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" autocomplete="off" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="CA_pass" class="col-sm-3 control-label">{tmpl_var name='CA_pass_txt'}</label>
+                    <div class="col-sm-9"><input type="password" name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" autocomplete="off" class="form-control" /></div></div>
+	  <!-- End content -->
+	  </div>
+	</div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingPerms">
+      <h4 class="panel-title">
+        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePerms" aria-expanded="false" aria-controls="collapsePerms">
+          {tmpl_var name='permissions_txt'}
+        </a>
+      </h4>
+    </div>
+    <div id="collapsePerms" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPerms">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	  <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='set_folder_permissions_on_update'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='web_folder_protection_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='web_folder_protection'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='add_web_users_to_sshusers_group'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='connect_userid_to_webid'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" /></div></div>
+            
+	  <!-- End content -->
+	  </div>
+	</div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingPHP">
+      <h4 class="panel-title">
+        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePHP" aria-expanded="false" aria-controls="collapsePHP">
+          {tmpl_var name='php_settings_txt'}
+        </a>
+      </h4>
+    </div>
+    <div id="collapsePHP" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPHP">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	  <div class="form-group apache">
+                    <label for="php_ini_path_apache" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_apache_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" class="form-control" /></div></div>
+                <div class="form-group apache">
+                    <label for="php_ini_path_cgi" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_cgi_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_fpm_init_script" class="col-sm-3 control-label">{tmpl_var name='php_fpm_init_script_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_fpm_ini_path" class="col-sm-3 control-label">{tmpl_var name='php_fpm_ini_path_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_fpm_pool_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_fpm_start_port" class="col-sm-3 control-label">{tmpl_var name='php_fpm_start_port_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_fpm_socket_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_open_basedir" class="col-sm-3 control-label">{tmpl_var name='php_open_basedir_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="php_ini_check_minutes" class="col-sm-3 control-label">{tmpl_var name='php_ini_check_minutes_txt'}</label>
+                    <div class="col-sm-6"><input type="text" name="php_ini_check_minutes" id="php_ini_check_minutes" value="{tmpl_var name='php_ini_check_minutes'}" class="form-control" /></div><div class="col-sm-3 input-sm"> &nbsp;{tmpl_var name='php_ini_check_minutes_info_txt'}
+                </div></div>
+                <div class="form-group">
+                    <label for="php_handler" class="col-sm-3 control-label">{tmpl_var name='php_handler_txt'}</label>
+                    <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
+                            {tmpl_var name='php_handler'}
+                        </select></div>
+                </div>
+	  <!-- End content -->
+	  </div>
+	</div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingApps">
+      <h4 class="panel-title">
+        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseApps" aria-expanded="false" aria-controls="collapseApps">
+          {tmpl_var name='apps_vhost_settings_txt'}
+        </a>
+      </h4>
+    </div>
+    <div id="collapseApps" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingApps">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	  				<div class="form-group">
+					<label for="apps_vhost_enabled" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_enabled_txt'}</label>
+					<div class="col-sm-9">{tmpl_var name='apps_vhost_enabled'}</div></div>
+                <div class="form-group">
+                    <label for="apps_vhost_port" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_port_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="apps_vhost_ip" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_ip_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" /></div></div>
+            
+	  <!-- End content -->
+	  </div>
+	</div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading" role="tab" id="headingAWStats">
+      <h4 class="panel-title">
+        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAWStats" aria-expanded="false" aria-controls="collapseAWStats">
+          {tmpl_var name='awstats_settings_txt'}
+        </a>
+      </h4>
+    </div>
+    <div id="collapseAWStats" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAWStats">
+      <div class="panel-body">
+	  <!-- Begin content -->
+	  <div class="form-group">
+                    <label for="awstats_conf_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_conf_dir_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="awstats_data_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_data_dir_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="awstats_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_pl_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" /></div></div>
+            
+	  <!-- End content -->
+	  </div>
+	</div>
+  </div>
 </div>
+			
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="clear"><div class="right">
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
 <script language="JavaScript" type="text/javascript">
-		var serverType = jQuery('#server_type').val();
-		adjustForm(serverType);
-		jQuery('#server_type').change(function(){
-			serverType = $(this).val();
-			adjustForm(serverType);
-		});
-		
-		function adjustForm(serverType){
-			if(serverType == "nginx"){
-				jQuery('.nginx').show();
-				/*
-				jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
-				jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
-				jQuery('#nginx_user').closest('div.ctrlHolder').show();
-				jQuery('#nginx_group').closest('div.ctrlHolder').show();
-				jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').show();
-				*/
-				
-				jQuery('.apache').hide();
-				/*
-				jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
-				jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
-				jQuery('#security_level').closest('div.ctrlHolder').hide();
-				jQuery('#check_apache_config').closest('div.ctrlHolder').hide();
-				jQuery('#user').closest('div.ctrlHolder').hide();
-				jQuery('#group').closest('div.ctrlHolder').hide();
-				jQuery('#php_ini_path_apache').closest('div.ctrlHolder').hide();
-				jQuery('#htaccess_allow_override').closest('div.ctrlHolder').hide();
-				*/
-			} else {
-				jQuery('.nginx').hide();
-				/*
-				jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
-				jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
-				jQuery('#nginx_user').closest('div.ctrlHolder').hide();
-				jQuery('#nginx_group').closest('div.ctrlHolder').hide();
-				jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').hide();
-				*/
-				
-				jQuery('.apache').show();
-				/*
-				jQuery('#vhost_conf_dir').closest('div.ctrlHolder').show();
-				jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
-				jQuery('#security_level').closest('div.ctrlHolder').show();
-				jQuery('#check_apache_config').closest('div.ctrlHolder').show();
-				jQuery('#user').closest('div.ctrlHolder').show();
-				jQuery('#group').closest('div.ctrlHolder').show();
-				jQuery('#php_ini_path_apache').closest('div.ctrlHolder').show();
-				jQuery('#htaccess_allow_override').closest('div.ctrlHolder').show();
-				*/
-			}
-		}
-</script>
\ No newline at end of file
+    var serverType = jQuery('#server_type').val();
+    jQuery('#server_type').replaceWith('<p>'+serverType+'</p><input type="hidden" name="server_type" value="'+serverType+'">');
+    adjustForm();
+    jQuery('#server_type').change(function(){
+        serverType = $(this).val();
+        adjustForm();
+    });
+    
+    function adjustForm(){
+        if(serverType == "nginx"){
+            jQuery('.nginx').show();
+            jQuery('.apache').hide();
+        } else {
+            jQuery('.nginx').hide();
+            jQuery('.apache').show();
+        }
+    }
+</script>

--
Gitblit v1.9.1