The branch, master has been updated via 4e5061d32356428960c8da7f988c83ebd30c94c6 (commit) from e0d1e92336a43b0b2997ff11f15957156cbb35f4 (commit)
- Log ----------------------------------------------------------------- commit 4e5061d32356428960c8da7f988c83ebd30c94c6 Author: Marc Delisle marc@infomarc.info Date: Mon Jul 19 10:03:17 2010 -0400
Generate password only available if JS is enabled
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 ++ js/messages.php | 4 ++++ js/password_generation.js | 10 ++++++++++ libraries/display_change_password.lib.php | 11 +---------- server_privileges.php | 13 +++---------- user_password.php | 5 ++++- 6 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 js/password_generation.js
diff --git a/ChangeLog b/ChangeLog index 43d3184..4240463 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,8 @@ $Id$ - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. - patch #3025161 [core] Prevent sending of unnecessary cookies, thanks to Piotr Przybylski - crackpl +- bug [password] Generate password only available if JS is enabled + (fixed for Privileges and Change password)
3.3.6.0 (not yet released)
diff --git a/js/messages.php b/js/messages.php index 8eb745a..aeb93f5 100644 --- a/js/messages.php +++ b/js/messages.php @@ -62,6 +62,10 @@ $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); $js_messages['strChangeDisplay'] = __('Choose column to display');
+/* password generation */ +$js_messages['strGeneratePassword'] = __('Generate password'); +$js_messages['strGenerate'] = __('Generate'); + echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { PMA_printJsValue("PMA_messages['" . $name . "']", $js_message); diff --git a/js/password_generation.js b/js/password_generation.js new file mode 100644 index 0000000..9153cc9 --- /dev/null +++ b/js/password_generation.js @@ -0,0 +1,10 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * for libraries/display_change_password.lib.php + * + */ + +$(document).ready(function() { + $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>'); + $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>'); +}); diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index b541aa5..1e88a4a 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -58,7 +58,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) </label> </td> </tr> - <tr> + <tr id="tr_element_before_generate_password"> <td> </td> <td> <input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" /> @@ -67,15 +67,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) </label> </td> </tr> - <tr> - <td> - <?php echo __('Generate Password'); ?> - </td> - <td> - <input type="button" id="button_generate_password" value="<?php echo __('Generate'); ?>" onclick="suggestPassword(this.form)" /> - <input type="text" name="generated_pw" id="generated_pw" /> - </td> - </tr> </table> </fieldset> <fieldset id="fieldset_change_password_footer" class="tblFooters"> diff --git a/server_privileges.php b/server_privileges.php index 576c0a1..ea4b8c8 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -16,6 +16,7 @@ require_once './libraries/common.inc.php'; */ $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php';
/** @@ -810,22 +811,14 @@ function PMA_displayLoginInformationFields($mode = 'new') . '</span>' . "\n" . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n" . '</div>' . "\n" - . '<div class="item">' . "\n" + . '<div class="item" id="div_element_before_generate_password">' . "\n" . '<label for="text_pma_pw2">' . "\n" . ' ' . __('Re-type') . ':' . "\n" . '</label>' . "\n" . '<span class="options"> </span>' . "\n" . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n" . '</div>' . "\n" - . '<div class="item">' . "\n" - . '<label for="button_generate_password">' . "\n" - . ' ' . __('Generate Password') . ':' . "\n" - . '</label>' . "\n" - . '<span class="options">' . "\n" - . ' <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />' . "\n" - . '</span>' . "\n" - . '<input type="text" name="generated_pw" id="generated_pw" />' . "\n" - . '</div>' . "\n" + // Generate password added here via jQuery . '</fieldset>' . "\n"; } // end of the 'PMA_displayUserAndHostFields()' function
diff --git a/user_password.php b/user_password.php index 9bfa280..91cfde0 100644 --- a/user_password.php +++ b/user_password.php @@ -42,6 +42,9 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { */ require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'server_privileges.js'; +$GLOBALS['js_include'][] = 'password_generation.js'; + /** * Displays an error message and exits if the user isn't allowed to use this * script @@ -124,8 +127,8 @@ if (isset($_REQUEST['nopass'])) { * aren't valid -> displays the form */ // Loads the headers -$GLOBALS['js_include'][] = 'server_privileges.js'; require_once './libraries/header.inc.php'; + echo '<h1>' . __('Change password') . '</h1>' . "\n\n";
// Displays an error message if required
hooks/post-receive