diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index ba81255f2..f6ae6fafe 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -93,18 +93,22 @@ function selectInput(form) { $('#text').show(); $('#copy').show(); $('#pass').hide(); + $('input[name="confirmStart"]').prop('disabled',true); $('#text').show(); $('#copy').hide(); $('#pass').hide(); + $('input[name="confirmStart"]').prop('disabled',true); $('#text').show(); if ($('input[name="luksReformat"]').prop('checked')) $('#copy').show(); else $('#copy').hide(); $('#pass').show(); + $('input[name="confirmStart"]').prop('disabled',true); $('#file').hide(); $('input[name="text"],input[name="copy"]').attr('type',$('input[name="showPass"]').prop('checked')?'text':'password'); - $('#cmdStart').prop('disabled',$('#copy').is(':visible') ? (form.text.value!=form.copy.value || form.text.value=='') : form.text.value==''); + var item = $('input[name="confirmStart"]').length ? $('input[name="confirmStart"]') : $('#cmdStart'); + item.prop('disabled',$('#copy').is(':visible') ? (form.text.value!=form.copy.value || form.text.value=='') : form.text.value==''); } else { form.text.value = ''; form.copy.value = ''; @@ -116,7 +120,8 @@ function selectInput(form) { $('#pass').hide(); - $('#cmdStart').prop('disabled',!form.file.value); + var item = $('input[name="confirmStart"]').length ? $('input[name="confirmStart"]') : $('#cmdStart'); + item.prop('disabled',!form.file.value); } } function getFileContent(event,form) { diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index bd31740f5..259fd6b94 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -114,7 +114,7 @@ _(Comments)_: :end _(Use cache pool (for new files/directories))_: -: > diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page index 5aaa2efd0..06a2f568f 100644 --- a/plugins/dynamix/UserAdd.page +++ b/plugins/dynamix/UserAdd.page @@ -62,10 +62,6 @@ function checkUsername(form) { swal({title:"_(Invalid user name)_",text:"_(Use only lowercase letters, digits, underscores and dashes)_",type:"error",confirmButtonText:'_(Ok)_'}); return false; } - if (username.match('^(disk[0-9]+|cache[0-9]*|parity[0-9]*|flash)$')) { - swal({title:"_(Invalid user name)_",text:"_(Do not use reserved names)_",type:"error",confirmButtonText:'_(Ok)_'}); - return false; - } if (form.userPasswordGUI.value.length > 128 || form.userPasswordConfGUI.value.length > 128) { swal({title:"_(Password too long)_",text:"_(Use a password up to 128 characters)_",type:"error",confirmButtonText:'_(Ok)_'}); return false; @@ -163,10 +159,10 @@ $(function(){
_(User name)_: -: +: :help1 -> Usernames may be up to 32 characters long and must start with a **lower case letter** or an underscore, +> Usernames may be up to 40 characters long and must start with a **lower case letter** or an underscore, > followed by **lower case letters**, digits, underscores, or dashes. They can end with a dollar sign. :end