";
+ }
+
//hash
- $hash = 0;
- $hash_id = 0;
- $restrict = $dbu->getEntitiesRestrictCriteria("glpi_plugin_accounts_hashes", '',
+ $hash_account = new PluginAccountsHash();
+ $hash = 0;
+ $hash_id = 0;
+ $restrict = $dbu->getEntitiesRestrictCriteria("glpi_plugin_accounts_hashes", '',
$this->getEntityID(), $hashclass->maybeRecursive());
$hashes = $dbu->getAllDataFromTable("glpi_plugin_accounts_hashes", $restrict);
if (!empty($hashes)) {
- foreach ($hashes as $hashe) {
- $hash = $hashe["hash"];
- $hash_id = $hashe["id"];
+ $hash_account->getFromDBByCrit(['id' => $this->fields["plugin_accounts_hash_id"]]);
+ if (count($hash_account->fields) > 0) {
+ $hash = $hash_account->getField("hash");
+ $hash_id = $hash_account->getField("id");
+ $alert = '';
+ } else {
+ $alert = __('There is no encryption key associated to this account, please select one above', 'accounts');
}
- $alert = '';
} else {
$alert = __('There is no encryption key for this entity', 'accounts');
}
$aeskey = new PluginAccountsAesKey();
+ echo Html::hidden('encrypted_password', ['value' => $this->fields["encrypted_password"],
+ 'id' => 'encrypted_password']);
+ echo Html::hidden('good_hash', ['value' => $hash,
+ 'id' => 'good_hash']);
+ echo Html::hidden('wrong_key_locale', ['value' => __('Wrong encryption key', 'accounts'),
+ 'id' => 'wrong_key_locale']);
+
//aeskey non enregistre
if ($hash) {
if (!$aeskey->getFromDBByHash($hash_id) || !$aeskey->fields["name"]) {
echo "| " . __('Encryption key', 'accounts') . " | ";
echo "";
- echo Html::hidden('encrypted_password', ['value' => $this->fields["encrypted_password"],
- 'id' => 'encrypted_password']);
- echo Html::hidden('good_hash', ['value' => $hash,
- 'id' => 'good_hash']);
- echo Html::hidden('wrong_key_locale', ['value' => __('Wrong encryption key', 'accounts'),
- 'id' => 'wrong_key_locale']);
if (!empty($ID) || $ID > 0) {
echo " ";
@@ -648,7 +697,7 @@ class='submit'>";
echo "";
echo "";
echo Html::scriptBlock("$('#account_form').submit(function(event){
- if ($('#hidden_password').val() == '' || $('#aeskey').val() == '') {
+ if ($('#hidden_password').val() == '' || $('#checkaeskey').val() == '') {
alert('" . __('You have not filled the password and encryption key', 'accounts') . "');
return false;
};
@@ -669,7 +718,11 @@ class='submit'>";
echo Html::hidden('id', ['value' => $ID]);
echo "";
echo Html::scriptBlock("$('#account_form').submit(function(event){
- if ($('#hidden_password').val() == '' || $('#aeskey').val() == '') {
+ let checkAESKey = $('#checkaeskey').val();
+ let hiddenPassword = $('#hidden_password').val();
+ let aeskey = $('#aeskey').val();
+
+ if ((hiddenPassword == '' || aeskey == '') && checkAESKey == '') {
alert('" . __('Password will not be modified', 'accounts') . "');
} else if (!check_hash()) {
alert('" . __('Wrong encryption key', 'accounts') . "');
diff --git a/sql/empty-1.3.sql b/install/sql/empty-1.3.sql
similarity index 100%
rename from sql/empty-1.3.sql
rename to install/sql/empty-1.3.sql
diff --git a/sql/empty-1.4.sql b/install/sql/empty-1.4.sql
similarity index 100%
rename from sql/empty-1.4.sql
rename to install/sql/empty-1.4.sql
diff --git a/sql/empty-1.5.0.sql b/install/sql/empty-1.5.0.sql
similarity index 100%
rename from sql/empty-1.5.0.sql
rename to install/sql/empty-1.5.0.sql
diff --git a/sql/empty-1.5.1.sql b/install/sql/empty-1.5.1.sql
similarity index 100%
rename from sql/empty-1.5.1.sql
rename to install/sql/empty-1.5.1.sql
diff --git a/sql/empty-1.5.3.sql b/install/sql/empty-1.5.3.sql
similarity index 100%
rename from sql/empty-1.5.3.sql
rename to install/sql/empty-1.5.3.sql
diff --git a/sql/empty-1.6.0.sql b/install/sql/empty-1.6.0.sql
similarity index 100%
rename from sql/empty-1.6.0.sql
rename to install/sql/empty-1.6.0.sql
diff --git a/sql/empty-1.7.0.sql b/install/sql/empty-1.7.0.sql
similarity index 100%
rename from sql/empty-1.7.0.sql
rename to install/sql/empty-1.7.0.sql
diff --git a/sql/empty-1.7.1.sql b/install/sql/empty-1.7.1.sql
similarity index 100%
rename from sql/empty-1.7.1.sql
rename to install/sql/empty-1.7.1.sql
diff --git a/sql/empty-1.8.0.sql b/install/sql/empty-1.8.0.sql
similarity index 100%
rename from sql/empty-1.8.0.sql
rename to install/sql/empty-1.8.0.sql
diff --git a/sql/empty-1.9.0.sql b/install/sql/empty-1.9.0.sql
similarity index 100%
rename from sql/empty-1.9.0.sql
rename to install/sql/empty-1.9.0.sql
diff --git a/sql/empty-2.0.0.sql b/install/sql/empty-2.0.0.sql
similarity index 100%
rename from sql/empty-2.0.0.sql
rename to install/sql/empty-2.0.0.sql
diff --git a/sql/empty-2.2.0.sql b/install/sql/empty-2.2.0.sql
similarity index 100%
rename from sql/empty-2.2.0.sql
rename to install/sql/empty-2.2.0.sql
diff --git a/sql/empty-2.4.0.sql b/install/sql/empty-2.4.0.sql
similarity index 100%
rename from sql/empty-2.4.0.sql
rename to install/sql/empty-2.4.0.sql
diff --git a/sql/empty-2.6.0.sql b/install/sql/empty-2.6.0.sql
similarity index 100%
rename from sql/empty-2.6.0.sql
rename to install/sql/empty-2.6.0.sql
diff --git a/install/sql/empty-2.7.0.sql b/install/sql/empty-2.7.0.sql
new file mode 100644
index 0000000..d002bb5
--- /dev/null
+++ b/install/sql/empty-2.7.0.sql
@@ -0,0 +1,132 @@
+DROP TABLE IF EXISTS `glpi_plugin_accounts_accounts`;
+CREATE TABLE `glpi_plugin_accounts_accounts` (
+ `id` int(11) NOT NULL auto_increment,
+ `entities_id` int(11) NOT NULL default '0',
+ `is_recursive` tinyint(1) NOT NULL default '0',
+ `name` varchar(255) collate utf8_unicode_ci default NULL,
+ `login` varchar(255) collate utf8_unicode_ci default NULL,
+ `encrypted_password` varchar(255) collate utf8_unicode_ci default NULL,
+ `others` varchar(255) collate utf8_unicode_ci default NULL,
+ `plugin_accounts_accounttypes_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_plugin_accounts_accounttypes (id)',
+ `plugin_accounts_accountstates_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_plugin_accounts_accountstates (id)',
+ `plugin_accounts_hash_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_plugin_accounts_hashes (id)',
+ `date_creation` timestamp NULL DEFAULT NULL,
+ `date_expiration` timestamp NULL DEFAULT NULL,
+ `users_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_users (id)',
+ `groups_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_groups (id)',
+ `users_id_tech` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_users (id)',
+ `groups_id_tech` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_groups (id)',
+ `locations_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_locations (id)',
+ `is_helpdesk_visible` int(11) NOT NULL default '1',
+ `date_mod` timestamp NULL DEFAULT NULL,
+ `comment` text collate utf8_unicode_ci,
+ `is_deleted` tinyint(1) NOT NULL default '0',
+ PRIMARY KEY (`id`),
+ KEY `name` (`name`),
+ KEY `entities_id` (`entities_id`),
+ KEY `plugin_accounts_accounttypes_id` (`plugin_accounts_accounttypes_id`),
+ KEY `plugin_accounts_accountstates_id` (`plugin_accounts_accountstates_id`),
+ KEY `users_id` (`users_id`),
+ KEY `groups_id` (`groups_id`),
+ KEY `users_id_tech` (`users_id_tech`),
+ KEY `groups_id_tech` (`groups_id_tech`),
+ KEY `date_mod` (`date_mod`),
+ KEY `is_helpdesk_visible` (`is_helpdesk_visible`),
+ KEY `is_deleted` (`is_deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_accounttypes`;
+CREATE TABLE `glpi_plugin_accounts_accounttypes` (
+ `id` int(11) NOT NULL auto_increment,
+ `entities_id` int(11) NOT NULL default '0',
+ `is_recursive` tinyint(1) NOT NULL default '0',
+ `name` varchar(255) collate utf8_unicode_ci default NULL,
+ `comment` text collate utf8_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_accountstates`;
+CREATE TABLE `glpi_plugin_accounts_accountstates` (
+ `id` int(11) NOT NULL auto_increment,
+ `name` varchar(255) collate utf8_unicode_ci default NULL,
+ `comment` text collate utf8_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_hashes`;
+CREATE TABLE `glpi_plugin_accounts_hashes` (
+ `id` int(11) NOT NULL auto_increment,
+ `name` varchar(255) collate utf8_unicode_ci default NULL,
+ `entities_id` int(11) NOT NULL default '0',
+ `is_recursive` tinyint(1) NOT NULL default '0',
+ `hash` varchar(255) collate utf8_unicode_ci default NULL,
+ `comment` text collate utf8_unicode_ci,
+ `date_mod` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `entities_id` (`entities_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_aeskeys`;
+CREATE TABLE `glpi_plugin_accounts_aeskeys` (
+ `id` int(11) NOT NULL auto_increment,
+ `name` varchar(255) collate utf8_unicode_ci default NULL,
+ `plugin_accounts_hashes_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`id`),
+ KEY `plugin_accounts_hashes_id` (`plugin_accounts_hashes_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_accounts_items`;
+CREATE TABLE `glpi_plugin_accounts_accounts_items` (
+ `id` int(11) NOT NULL auto_increment,
+ `plugin_accounts_accounts_id` int(11) NOT NULL default '0',
+ `items_id` int(11) NOT NULL default '0' COMMENT 'RELATION to various tables, according to itemtype (id)',
+ `itemtype` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'see .class.php file',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unicity` (`plugin_accounts_accounts_id`,`itemtype`,`items_id`),
+ KEY `FK_device` (`items_id`,`itemtype`),
+ KEY `item` (`itemtype`,`items_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_configs`;
+CREATE TABLE `glpi_plugin_accounts_configs` (
+ `id` int(11) NOT NULL auto_increment,
+ `delay_expired` varchar(50) collate utf8_unicode_ci NOT NULL default '30',
+ `delay_whichexpire` varchar(50) collate utf8_unicode_ci NOT NULL default '30',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+INSERT INTO `glpi_plugin_accounts_configs` ( `id` , `delay_expired` , `delay_whichexpire`) VALUES (1, '30', '30');
+
+DROP TABLE IF EXISTS `glpi_plugin_accounts_notificationstates`;
+CREATE TABLE `glpi_plugin_accounts_notificationstates` (
+ `id` int(11) NOT NULL auto_increment,
+ `plugin_accounts_accountstates_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_plugin_accounts_accountstates (id)',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_compte_mailing`;
+
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','2','3','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','3','1','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','4','2','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','5','4','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','6','5','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsAccount','7','6','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','2','3','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','3','1','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','4','2','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','5','4','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','6','5','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsHelpdesk','7','6','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','2','3','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','3','1','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','4','2','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','5','4','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','6','5','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','7','6','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginAccountsGroup','8','7','0');
+
+INSERT INTO `glpi_notificationtemplates` VALUES(NULL, 'New Accounts', 'PluginAccountsAccount', '2010-02-17 22:36:46','',NULL, '2010-02-17 22:36:46');
+INSERT INTO `glpi_notificationtemplates` VALUES(NULL, 'Alert Accounts', 'PluginAccountsAccount', '2010-02-23 11:37:46','',NULL, '2010-02-17 22:36:46');
diff --git a/sql/update-1.1.sql b/install/sql/update-1.1.sql
similarity index 100%
rename from sql/update-1.1.sql
rename to install/sql/update-1.1.sql
diff --git a/sql/update-1.3.sql b/install/sql/update-1.3.sql
similarity index 100%
rename from sql/update-1.3.sql
rename to install/sql/update-1.3.sql
diff --git a/sql/update-1.4.sql b/install/sql/update-1.4.sql
similarity index 100%
rename from sql/update-1.4.sql
rename to install/sql/update-1.4.sql
diff --git a/sql/update-1.5.0.sql b/install/sql/update-1.5.0.sql
similarity index 100%
rename from sql/update-1.5.0.sql
rename to install/sql/update-1.5.0.sql
diff --git a/sql/update-1.5.1.sql b/install/sql/update-1.5.1.sql
similarity index 100%
rename from sql/update-1.5.1.sql
rename to install/sql/update-1.5.1.sql
diff --git a/sql/update-1.5.3.sql b/install/sql/update-1.5.3.sql
similarity index 100%
rename from sql/update-1.5.3.sql
rename to install/sql/update-1.5.3.sql
diff --git a/sql/update-1.6.0.sql b/install/sql/update-1.6.0.sql
similarity index 100%
rename from sql/update-1.6.0.sql
rename to install/sql/update-1.6.0.sql
diff --git a/sql/update-1.7.0.sql b/install/sql/update-1.7.0.sql
similarity index 100%
rename from sql/update-1.7.0.sql
rename to install/sql/update-1.7.0.sql
diff --git a/sql/update-1.7.1.sql b/install/sql/update-1.7.1.sql
similarity index 100%
rename from sql/update-1.7.1.sql
rename to install/sql/update-1.7.1.sql
diff --git a/sql/update-1.8.0.sql b/install/sql/update-1.8.0.sql
similarity index 100%
rename from sql/update-1.8.0.sql
rename to install/sql/update-1.8.0.sql
diff --git a/sql/update-1.9.0.sql b/install/sql/update-1.9.0.sql
similarity index 100%
rename from sql/update-1.9.0.sql
rename to install/sql/update-1.9.0.sql
diff --git a/install/sql/update-2.7.0.sql b/install/sql/update-2.7.0.sql
new file mode 100644
index 0000000..93c5eb3
--- /dev/null
+++ b/install/sql/update-2.7.0.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `glpi_plugin_accounts_accounts`
+ADD `plugin_accounts_hash_id` INT(11) NOT NULL default '0';
\ No newline at end of file
diff --git a/install/update_270_migrateMultiHashEntities.php b/install/update_270_migrateMultiHashEntities.php
new file mode 100644
index 0000000..99bb168
--- /dev/null
+++ b/install/update_270_migrateMultiHashEntities.php
@@ -0,0 +1,61 @@
+.
+ --------------------------------------------------------------------------
+ */
+
+/**
+ * Update from 1.3.3 to 1.5.0
+ *
+ * @return bool for success (will die for most error)
+ * */
+function update_270_migrateMultiHashEntities() {
+ global $DB;
+ $dbu = new DbUtils();
+ $entity = new Entity();
+ $hashes = new PluginAccountsHash();
+ $account = new PluginAccountsAccount();
+
+ $restrict = '';
+ $entities = $entity->find();
+ foreach ($entities as $e) {
+ $restrict = $dbu->getEntitiesRestrictCriteria("glpi_plugin_accounts_hashes", '', $e['id'], $hashes->maybeRecursive());
+ $hashesList = $dbu->getAllDataFromTable("glpi_plugin_accounts_hashes", $restrict);
+ $idHash = 0;
+
+ if (count($hashesList) > 0) {
+ foreach ($hashesList as $hashItem) {
+ $idHash = $hashItem['id'];
+ }
+
+ $accounts = $account->find(['entities_id' => $e['id']]);
+ foreach ($accounts as $a) {
+ $input = [];
+ $input['id'] = $a['id'];
+ $input['plugin_accounts_hash_id'] = $idHash;
+ $account->update($input);
+ }
+ }
+ }
+ return true;
+}
diff --git a/scripts/account.form.js b/scripts/account.form.js
index efd98dd..872f41d 100644
--- a/scripts/account.form.js
+++ b/scripts/account.form.js
@@ -17,8 +17,8 @@ $(document).ready(function () {
}
// find the good element
- var target = $($('.account_to_clipboard_wrapper'));
- if (target.attr('class') == 'account_to_clipboard_wrapper') {
+ var target = $('.account_to_clipboard_wrapper');
+ if (target.attr('class') === 'account_to_clipboard_wrapper') {
target = target.find('*');
}
diff --git a/scripts/clipboard.js b/scripts/clipboard.js
index 9ea5a25..52f2c74 100644
--- a/scripts/clipboard.js
+++ b/scripts/clipboard.js
@@ -31,7 +31,7 @@
$(function() {
// set a function to track drag hover event
$(document).on("click", ".account_to_clipboard_wrapper", function(event) {
-
+ event.preventDefault();
var input = $('#hidden_password');
if (input.attr("type") == "password") {
input.attr("type", "text");
@@ -40,10 +40,8 @@ $(function() {
}
// find the good element
- var target = $(event.target);
- console.log(event);
- console.log(target);
- if (target.attr('class') == 'account_to_clipboard_wrapper') {
+ var target = $('.account_to_clipboard_wrapper');
+ if (target.attr('class') === 'account_to_clipboard_wrapper') {
target = target.find('*');
}
diff --git a/scripts/crypt.js b/scripts/crypt.js
index f40ae9a..972e711 100644
--- a/scripts/crypt.js
+++ b/scripts/crypt.js
@@ -1,52 +1,92 @@
var check_hash = function () {
- var good_hash = $("#good_hash").val();
- var aeskey = $("#aeskey").val();
- if (aeskey == '' || aeskey == undefined) {
- return false;
- }
+ var good_hash = $("#good_hash").val();
+ var aeskey = $("#aeskey").val();
+ var on_change_hash = $("#change_good_hash").text();
+ var checkAeskey = $("#checkaeskey").val();
+
+ var select_encryption_key = false;
+
+ if (checkAeskey != '') {
+ select_encryption_key = true;
+ }
+
+ if (select_encryption_key) {
+ return generic_check_hash(on_change_hash, checkAeskey)
+ } else {
+ return generic_check_hash(good_hash, aeskey)
+ }
+};
+
+
+
+var generic_check_hash = function (good_hash, aeskey) {
+
+ if (aeskey == '' || aeskey == undefined) {
+ return false;
+ }
var hash = SHA256(SHA256(aeskey));
- if (hash != good_hash) {
- return false;
- }
+ if (hash != good_hash) {
+ return false;
+ }
return true;
};
+
var decrypt_password = function (sufix) {
sufix = sufix || "";
+
var aeskey = $("#aeskey").val();
var decrypted_password = AESDecryptCtr($("#encrypted_password" + sufix).val(),
SHA256(aeskey),
256);
- if ($("#hidden_password" + sufix).length) { //isset ?
- $("#hidden_password" + sufix).val(decrypted_password);
- }
-
- if (document.location.pathname.indexOf('accounts') > 0) {
- var idcrypt = $('form#account_form input[name=id]').val();
- var url = '../ajax/log_decrypt.php'
- } else {
- var idcrypt = sufix;
- var url = '../plugins/accounts/ajax/log_decrypt.php';
- }
+ if ($("#hidden_password" + sufix).length) { //isset ?
+ $("#hidden_password" + sufix).val(decrypted_password);
+ }
+
+ if (document.location.pathname.indexOf('accounts') > 0) {
+ var idcrypt = $('form#account_form input[name=id]').val();
+ var url = '../ajax/log_decrypt.php'
+ } else {
+ var idcrypt = sufix;
+ var url = '../plugins/accounts/ajax/log_decrypt.php';
+ }
$.ajax({
- 'url': url,
- 'type': 'POST',
- 'data': {'idcrypt': idcrypt}
- });
+ 'url': url,
+ 'type': 'POST',
+ 'data': {'idcrypt': idcrypt}
+ });
return decrypted_password;
};
var encrypt_password = function (sufix) {
- sufix = sufix || "";
- var aeskey = $("#aeskey").val();
- var encrypted_password = AESEncryptCtr($('#hidden_password' + sufix).val(),
- SHA256(aeskey),
- 256);
+ sufix = sufix || "";
+ var aeskey = $("#aeskey").val();
+ var checkAeskey = $("#checkaeskey").val();
+ var select_encryption_key = false;
+ var encrypted_password = '';
+
+ if (checkAeskey != '') {
+ select_encryption_key = true;
+ }
+
+ console.log(select_encryption_key)
+
+
+ if (select_encryption_key) {
+ encrypted_password = AESEncryptCtr($('#hidden_password' + sufix).val(),
+ SHA256(checkAeskey),
+ 256);
+ } else {
+ encrypted_password = AESEncryptCtr($('#hidden_password' + sufix).val(),
+ SHA256(aeskey),
+ 256);
+ }
+
$('#encrypted_password').val(encrypted_password);
$('#account_form').submit();
};
diff --git a/setup.php b/setup.php
index ed7fa85..bac14fd 100644
--- a/setup.php
+++ b/setup.php
@@ -27,7 +27,7 @@
--------------------------------------------------------------------------
*/
-define('PLUGIN_ACCOUNTS_VERSION', '2.6.0');
+define('PLUGIN_ACCOUNTS_VERSION', '2.7.0');
// Init the hooks of the plugins -Needed
function plugin_init_accounts() {
|