Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/admin/templates/server_config_web_edit.htm

@@ -31,18 +31,22 @@
                    {tmpl_var name='website_symlinks_rel'}
                </div>
            </div>
         <div class="ctrlHolder">
                <label for="website_symlinks_rel">{tmpl_var name='network_filesystem_txt'}</label>
                <div class="multiField">
                    {tmpl_var name='network_filesystem'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
                <input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='website_autoalias_note_txt'} <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="ctrlHolder apache">
         <label for="vhost_rewrite_v6">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
         <div class="multiField">
            {tmpl_var name='vhost_rewrite_v6'}
         </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" />
@@ -127,6 +131,18 @@
                    {tmpl_var name='overquota_notify_client'}
                </div>
            </div>
         <div class="ctrlHolder">
            <p class="label">{tmpl_var name='overquota_db_notify_admin_txt'}</p>
            <div class="multiField">
               {tmpl_var name='overquota_db_notify_admin'}
             </div>
         </div>
         <div class="ctrlHolder">
            <p class="label">{tmpl_var name='overquota_db_notify_client_txt'}</p>
            <div class="multiField">
               {tmpl_var name='overquota_db_notify_client'}	
             </div>
         </div>
            <div class="ctrlHolder">
                <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
                <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
@@ -145,13 +161,21 @@
                        {tmpl_var name='enable_sni'}
                    </div>
                </div>
            <div class="ctrlHolder">
               <p class="label">
                  <tmpl_var name="enable_spdy_txt">
               </p>
               <div class="multiField">
                  <tmpl_var name="enable_spdy">
               </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" />
                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" 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" />
                    <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput" />
                </div>
            </div>
            <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
@@ -219,6 +243,18 @@
                    <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">
                    <label for="php_ini_check_minutes">{tmpl_var name='php_ini_check_minutes_txt'}</label>
                    <input name="php_ini_check_minutes" id="php_ini_check_minutes" value="{tmpl_var name='php_ini_check_minutes'}" size="40" type="text" class="textInput" /> &nbsp;{tmpl_var name='php_ini_check_minutes_info_txt'}
                </div>
                <div class="ctrlHolder">
                    <label for="php_handler">{tmpl_var name='php_handler_txt'}</label>
                    <div class="multiField">
                        <select name="php_handler" id="php_handler" class="selectInput">
                            {tmpl_var name='php_handler'}
                        </select>
                    </div>
                </div>
            </div>
            <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
            <div style="display:none;">