unify the way of setting password.

This commit is contained in:
Alexey Shpakovsky 2021-06-04 03:15:05 +02:00
parent 9ac1ac4619
commit a0d2335088
No known key found for this signature in database
GPG key ID: 5797A726A2A4230A

View file

@ -38,6 +38,21 @@ function abook_get_password($data, $opt){
} }
} }
function abook_set_password($password, $opt){
global $username, $data_dir;
switch ($opt) {
case '0': $data = ''; break;
case '1':
if(preg_match('/^\**$/', $password)) { return; }
require_once(SM_PATH . 'functions/auth.php');
require_once(SM_PATH . 'functions/strings.php');
$data = OneTimePadEncrypt($password, base64_encode(sqauth_read_password()));
break;
case '2': $data = $password; break;
}
setPref($data_dir, $username, 'plugin_abook_carddav_password', $data);
}
/** /**
* Initialized address book backend * Initialized address book backend
*/ */
@ -167,24 +182,20 @@ function abook_carddav_optpage() {
} }
function plugin_abook_carddav_password_save($option){ function plugin_abook_carddav_password_save($option){
global $plugin_abook_carddav_password; global $username, $data_dir;
$plugin_abook_carddav_password = $option->$new_value; $opt = getPref($data_dir, $username, 'plugin_abook_carddav_password_opt', '2');
abook_set_password($option->$new_value, $opt);
} }
function plugin_abook_carddav_password_opt_save($option){ function plugin_abook_carddav_password_opt_save($option){
global $plugin_abook_carddav_password; global $username, $data_dir;
// get current plassword
$abook_password_text = getPref($data_dir, $username, 'plugin_abook_carddav_password');
$abook_password_opt = getPref($data_dir, $username, 'plugin_abook_carddav_password_opt', '2');
$abook_password = abook_get_password($abook_password_text, $abook_password_opt);
save_option($option); save_option($option);
switch($option->new_value){ // reencrypt it
case '0': $plugin_abook_carddav_password = ''; break; abook_set_password($abook_password, $option->$new_value);
case '1':
if(preg_match('/^\**$/', $plugin_abook_carddav_password)) { break; }
require_once(SM_PATH . 'functions/auth.php');
require_once(SM_PATH . 'functions/strings.php');
$plugin_abook_carddav_password = OneTimePadEncrypt($plugin_abook_carddav_password, base64_encode(sqauth_read_password()));
break;
case '2': break;
}
setPref($data_dir, $username, 'plugin_abook_carddav_password', $plugin_abook_carddav_password);
} }