- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -89,6 +89,12 @@
                    <tmpl_else>
                        <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
            </div>
         <tmpl_if name="edit_disabled">
            <div class="form-group">
               <label for="document_root" class="col-sm-3 control-label" readonly >{tmpl_var name='document_root_txt'}</label>
               <div class="col-sm-9">{tmpl_var name='document_root'}</div>
            </div>
         </tmpl_if>
            <div class="form-group">
                <label for="hd_quota" class="col-sm-3 control-label">{tmpl_var name='hd_quota_txt'}</label>
                <div class="col-sm-6"><input type="text" name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;MB
@@ -217,6 +223,12 @@
                </select></div>
            </div>
         {tmpl_var name="directive_snippets_id"}
         <div class="form-group nginx pagespeed">
            <label class="col-sm-3 control-label">{tmpl_var name='enable_pagespeed_txt'}</label>
            <div class="col-sm-9">
               {tmpl_var name="enable_pagespeed"}
            </div>
         </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9">
@@ -274,6 +286,21 @@
    jQuery('#parent_domain_id').change(function() {
        reloadServerId(false);
    });
   // new Vhostsubdomains/Vhostaliasdomains
   if(serverId == '') jQuery('#parent_domain_id').trigger('change');
	
   if(jQuery('#directive_snippets_id').val() > 0){
      jQuery('.pagespeed').show();
   } else {
      jQuery('.pagespeed').hide();
   }
   jQuery('#directive_snippets_id').change(function(){
      if(jQuery(this).val() > 0){
         jQuery('.pagespeed').show();
      } else {
         jQuery('.pagespeed').hide();
      }
   });
    
    function reloadServerId(noFormChange) {
        var parentWebId = jQuery('#parent_domain_id').val();
@@ -289,6 +316,19 @@
            if(data.servertype == "nginx"){
                var selected = jQuery('#php').val();
                jQuery('.apache').hide();
            jQuery('.nginx').show();
            if(jQuery('#directive_snippets_id').val() > 0){
               jQuery('.pagespeed').show();
            } else {
               jQuery('.pagespeed').hide();
            }
            jQuery('#directive_snippets_id').change(function(){
               if(jQuery(this).val() > 0){
                  jQuery('.pagespeed').show();
               } else {
                  jQuery('.pagespeed').hide();
               }
            });
                if(selected != "no" && selected != "php-fpm" && selected != "hhvm") {
                    jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
                }
@@ -297,6 +337,7 @@
                jQuery('#php option[value="mod"]').hide();
                jQuery('#php option[value="suphp"]').hide();
            } else {
            jQuery('.nginx').hide();
                jQuery('.apache').show();
                jQuery('#php option[value="fast-cgi"]').show();
                jQuery('#php option[value="cgi"]').show();
@@ -331,22 +372,44 @@
   }
      
    function reloadWebIP() {
        ISPConfig.loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
        ISPConfig.loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
        ISPConfig.loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId<tmpl_if name="use_combobox" value="y">, rerenderSelect2</tmpl_if>);
        ISPConfig.loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId<tmpl_if name="use_combobox" value="y">, rerenderSelect2</tmpl_if>);
      <tmpl_if name="use_combobox" value="y">
      //$('#ip_address').add('#ipv6_address').select2();
      </tmpl_if>
    }
	
   function rerenderSelect2(elem) {
      $('#'+elem).select2();
   }
      
    function reloadFastcgiPHPVersions(noFormChange) {
        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) {
            var options = '<option value="">Default</option>';
            //var options = '<option value="">Default</option>';
         var options = '';
            var phpfastcgiselected = '';
            $.each(data, function(key, val) {
            <tmpl_if name="id">
                if($('#fastcgi_php_version').val() == key){
                    phpfastcgiselected = ' selected="selected"';
                } else {
                    phpfastcgiselected = '';
                }
            </tmpl_else>
               phpfastcgiselected = '';
            </tmpl_if>
                options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
            });
         <tmpl_if name="id">
         if($('#fastcgi_php_version').val() == ''){
                phpfastcgiselected = ' selected="selected"';
            } else {
                phpfastcgiselected = '';
            }
         </tmpl_else>
            phpfastcgiselected = '';
         </tmpl_if>
         options += '<option value=""'+phpfastcgiselected+'>{tmpl_var name="default_php_txt"}</option>';
            $('#fastcgi_php_version').html(options).change();
            if(noFormChange) ISPConfig.resetFormChanged();
        });
@@ -355,12 +418,12 @@
    <tmpl_if name="readonly_tab">
        jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').not('#directive_snippets_id').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
        jQuery('#dom-edit-submit').click(function() {
         submitForm('pageForm','sites/web_vhost_domain_edit.php');
         ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
        });
    <tmpl_else>
        jQuery('#dom-edit-submit').click(function() {
            submitForm('pageForm','sites/web_vhost_domain_edit.php');
            ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
        });
    </tmpl_if>
         
</script>
</script>