From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/admin/templates/server_config_web_edit.htm | 186 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 180 insertions(+), 6 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index e5a317f..f5710fa 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -5,6 +5,14 @@
<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" />
@@ -16,14 +24,28 @@
<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>
<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">
+ <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">
<p class="label">{tmpl_var name='security_level_txt'}</p>
@@ -33,14 +55,147 @@
</select>
</div>
</div>
- <div class="ctrlHolder">
- <label for="user">{tmpl_var name='user_txt'}</label>
+ <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">
- <label for="group">{tmpl_var name='group_txt'}</label>
+ <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 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="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
+ <div style="display:none;">
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='enable_sni_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='enable_sni'}
+ </div>
+ </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>
+ <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
+ <div style="display:none;">
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='set_folder_permissions_on_update'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='add_web_users_to_sshusers_group'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='connect_userid_to_webid'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+ <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ </div>
+ <div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
+ <div style="display:none;">
+ <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 apache">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+ <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" 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>
+ <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
+ <div style="display:none;">
+ <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>
+ <div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
+ <div style="display:none;">
+ <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>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -52,3 +207,22 @@
</div>
</div>
+<script language="JavaScript" type="text/javascript">
+ var serverType = jQuery('#server_type').val();
+ jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><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>
\ No newline at end of file
--
Gitblit v1.9.1