Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2014-03-25 16:59:29 +0400
committerMichal Čihař <michal@cihar.com>2014-03-25 16:59:29 +0400
commita40ce0eda7d57ac6e6f71a2aa0579756df0f7653 (patch)
tree29077bd61d11cfb7339a31287ef35f694f9fc43f /js/tbl_change.js
parent555051618da394301f1843642090d4390fddef70 (diff)
Support AES_DECRYPT as well
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'js/tbl_change.js')
-rw-r--r--js/tbl_change.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 31540e3c17..b95efc48ef 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -157,7 +157,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType)
" id=salt_" + target.id + " placeholder='" + PMA_messages.strEncryptionKey + "'>";
//If AES_ENCRYPT is Selected then append the new textbox for salt
- if (target.value == "AES_ENCRYPT") {
+ if (target.value == "AES_DECRYPT" || target.value == "AES_ENCRYPT") {
if (!($("#salt_" + target.id).length)) {
$("#" + target.id).parent().next("td").next("td").find("input[name*='fields']").after(new_salt_box);
}
@@ -556,7 +556,7 @@ AJAX.registerOnload('tbl_change.js', function () {
var salt;
var copySalt = false;
- if (functionName === 'AES_ENCRYPT') {
+ if (functionName === 'AES_ENCRYPT' || functionName === 'AES_DECRYPT') {
// Dialog title.
var title = functionName;
// Dialog buttons functions.
@@ -655,7 +655,7 @@ function applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows
}).attr("selected","selected");
// Handle salt field.
- if (functionName === 'AES_ENCRYPT') {
+ if (functionName === 'AES_ENCRYPT' || functionName === 'AES_DECRYPT') {
if ($("#salt_" + targetSelectList.attr("id")).length === 0) {
// Get hash value.
var hashed_value = targetSelectList.attr("name").match(/\[multi\_edit\]\[\d\]\[(.*)\]/);