diff options
author | M.Gergo | 2020-09-02 21:02:17 +0200 |
---|---|---|
committer | M.Gergo | 2020-09-02 21:02:17 +0200 |
commit | cf6a58003f47139501a2907f8a4bc400b23fda66 (patch) | |
tree | fb7f9e17b609143987ca2f324e27c610886284a9 /mayor-orig/mayor-base/www/skin | |
parent | 9bfbb60898b55ba4e1bd50c052c7ec4aaafc1ff8 (diff) | |
parent | 9044c44af70eff76d875137de553d5904e475f6d (diff) | |
download | mayor-cf6a58003f47139501a2907f8a4bc400b23fda66.tar.gz mayor-cf6a58003f47139501a2907f8a4bc400b23fda66.zip |
Merge branch 'MaYor-dev'
Diffstat (limited to 'mayor-orig/mayor-base/www/skin')
3 files changed, 42 insertions, 0 deletions
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js index f4b27b06..003422ac 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js +++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js @@ -1,3 +1,4 @@ + var debug = false; function _debug(str) { if (debug) console.log(str); diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml index 59dab0ea..295f6eeb 100644 --- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml @@ -33,6 +33,15 @@ echo '<tbody>'."\n"; echo '<tr>'."\n"; echo '<td>'."\n"; + echo _PWGEN; + echo '</td>'."\n"; + echo '<td>'."\n"; + echo '<input id="txtPwgen" type="text" value="" maxlength="32" />'."\n"; + echo '<div id="btnPwgen" class="icon-fork" style="cursor: pointer"></div>'; + echo '</td>'."\n"; + echo '</tr>'."\n"; + echo '<tr>'."\n"; + echo '<td>'."\n"; echo _USERNAME; echo '</td>'."\n"; echo '<td>'."\n"; diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js new file mode 100644 index 00000000..221c2f98 --- /dev/null +++ b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js @@ -0,0 +1,32 @@ +$(function() { + + var str = randString($('#newpassword')); + $("#btnPwgen").click(function() { + $('#newPassword').val(str); + $('#verification').val(str); + }); + $('#txtPwgen').val(str); + +}); + +function randString(id){ + var dataSet = 'a-z,A-Z,0-9'.split(','); + var possible = ''; + if($.inArray('a-z', dataSet) >= 0){ + possible += 'abcdefghijklmnopqrstuvwxyz'; + } + if($.inArray('A-Z', dataSet) >= 0){ + possible += 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + } + if($.inArray('0-9', dataSet) >= 0){ + possible += '0123456789'; + } + if($.inArray('#', dataSet) >= 0){ + possible += '![]{}()%&*$#^<>~@|'; + } + var text = ''; + for(var i=0; i < 10; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return text; +} |