diff --git a/login.php b/login.php index 3a877b663..630c5aac9 100644 --- a/login.php +++ b/login.php @@ -31,7 +31,7 @@ if ($_SERVER['REQUEST_URI'] == '/logout') { $_SESSION['unraid_user'] = $_POST['username']; session_regenerate_id(true); session_write_close(); - exec("logger -t webGUI ".escapeshellarg("Successful login user {$_POST['username']} from {$_SERVER['REMOTE_ADDR']}")); + exec("logger -t webGUI ".escapeshellarg("Successful login user {$_POST['username']} from {$_SERVER['REMOTE_ADDR']}")); header("Location: /".$var['START_PAGE']); exit; } @@ -339,7 +339,7 @@ $theme_dark = in_array($display['theme'],['black','gray']);

- +

'.$error.'

'; ?> diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index 4e05f755a..68922ee1b 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -42,7 +42,7 @@ function check_encryption() { echo mk_option(1,'text','Passphrase'); echo mk_option(1,'file','Keyfile'); echo ""; - echo "Passphrase:show passphrase"; + echo "Passphrase:show passphrase"; echo "Retype passphrase:"; echo "Keyfile:"; } @@ -80,6 +80,10 @@ span#pass{display:none;margin-left:20px} var ctrl = "'>"; function selectInput(form) { + + form.input.value = 'file'; + form.input.disabled = true; + if (form.input.value == 'text') { form.file.value = ''; form.local.value = ''; @@ -131,8 +135,18 @@ function prepareInput(form) { form.text.disabled = true; form.copy.disabled = true; if (form.text.value) { - $(form).append(''); - form.submit(); + var valid = new RegExp('^[ -~]+$'); + if (valid.test(form.text.value)) { + $(form).append(''); + form.submit(); + } else { + form.input.disabled = false; + form.local.disabled = false; + form.file.disabled = false; + form.text.disabled = false; + form.copy.disabled = false; + swal({title:'Printable Characters Only',text:'Use ASCII characters from space " " to tilde "~"
Otherwise use the keyfile method for UTF8 input',html:true,type:'error'}); + } return; } var data = {}; diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page index 5540ff0b9..0366746ea 100644 --- a/plugins/dynamix/UserAdd.page +++ b/plugins/dynamix/UserAdd.page @@ -55,15 +55,17 @@ function checkUsername(form) { swal({title:"Invalid user name",text:"Do not use reserved names",type:"error"}); return false; } - if (form.userPassword.value.length > 128 || form.userPasswordConf.value.length > 128) { + 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"}); return false; } if (filename) { $.post("/webGui/include/FileUpload.php",{cmd:'save',path:path,filename:filename,output:username+'.png'}); } - form.userPassword.value = base64(form.userPassword.value); - form.userPasswordConf.value = base64(form.userPasswordConf.value); + form.userPassword.value = base64(form.userPasswordGUI.value); + form.userPasswordConf.value = base64(form.userPasswordConfGUI.value); + form.userPasswordGUI.disabled = true; + form.userPasswordConfGUI.disabled = true; return true; } @@ -138,12 +140,14 @@ Custom image: > The image will be scaled to 48x48 pixels in size. The maximum image file upload size is 95 kB (97,280 bytes). Password: -: + +: > Up to 128 characters. Retype password: -: + +:   : diff --git a/plugins/dynamix/UserEdit.page b/plugins/dynamix/UserEdit.page index 804f4cf6f..5ce5c7c51 100644 --- a/plugins/dynamix/UserEdit.page +++ b/plugins/dynamix/UserEdit.page @@ -47,12 +47,14 @@ var path = '/boot/config/plugins/dynamix/users'; var filename = ''; function checkPassword(form) { - if (form.userPassword.value.length > 128 || form.userPasswordConf.value.length > 128) { + 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"}); return false; } - form.userPassword.value = base64(form.userPassword.value); - form.userPasswordConf.value = base64(form.userPasswordConf.value); + form.userPassword.value = base64(form.userPasswordGUI.value); + form.userPasswordConf.value = base64(form.userPasswordConfGUI.value); + form.userPasswordGUI.disabled = true; + form.userPasswordConfGUI.disabled = true; return true; } @@ -157,12 +159,14 @@ Delete Password: -: + +: > Up to 128 characters. Retype password: -: + +:   :