diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-27 17:40:41 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-27 17:40:41 -0400 |
| commit | 98ca6c4a169334a998e3a5131a7aae12df4544d2 (patch) | |
| tree | 79e34d2407be4a3b1f2edb0f2bda5c48863b5efe /settings | |
| parent | eee7d8da50045e6b659466f8567a4672b37184f4 (diff) | |
| download | nextcloud-server-98ca6c4a169334a998e3a5131a7aae12df4544d2.tar.gz nextcloud-server-98ca6c4a169334a998e3a5131a7aae12df4544d2.zip | |
Fix changing password in personal page (not complete)
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/changepassword.php | 2 | ||||
| -rw-r--r-- | settings/js/personal.js | 40 |
2 files changed, 24 insertions, 18 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 98c2a8b37a1..e7e67115dda 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -12,7 +12,7 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) exit(); } -$username = $_POST["username"]; +$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser(); $password = $_POST["password"]; // Return Success story diff --git a/settings/js/personal.js b/settings/js/personal.js index e38eef62a8b..aad57224388 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -6,23 +6,29 @@ $(document).ready(function(){ $("#passwordbutton").click( function(){ - // Serialize the data - var post = $( "#passwordform" ).serialize(); - $('#passwordchanged').hide(); - $('#passworderror').hide(); - // Ajax foo - $.post( 'ajax/changepassword.php', post, function(data){ - if( data.status == "success" ){ - $('#pass1').val(''); - $('#pass2').val(''); - $('#passwordchanged').show(); - } - else{ - $('#passworderror').html( data.data.message ); - $('#passworderror').show(); - } - }); - return false; + if ($('#pass1').val() != '' && $('#pass2').val() != '') { + // Serialize the data + var post = $( "#passwordform" ).serialize(); + $('#passwordchanged').hide(); + $('#passworderror').hide(); + // Ajax foo + $.post( 'ajax/changepassword.php', post, function(data){ + if( data.status == "success" ){ + $('#pass1').val(''); + $('#pass2').val(''); + $('#passwordchanged').show(); + } + else{ + $('#passworderror').html( data.data.message ); + $('#passworderror').show(); + } + }); + return false; + } else { + $('passworderror').show(); + return false; + } + }); $("#languageinput").change( function(){ |