Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Fix spelling for crypted and referer (#27408)

Browse Source 
# Qual: Fix spelling for crypted and referer.

The proper spelling is encrypted and referrer, but the code has
some occurences where referer and crypted need to be maintained.

To make verification easier, this spelling correction is limited to
mostly these corrections and some minor translations and a only a
few other corrections.

crypted and referer are added as exceptions for spelling after this fix.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
MDW
2024-01-11 10:07:06 +01:00
committed by GitHub
parent 5cb0da4bd6
commit 58ba3e31fa
22 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/commonobject.class.php
View File

@@ -6469,7 +6469,7 @@ abstract class CommonObject
case 'password':
$algo = '';
if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
// If there is an encryption choice, we use it to crypt data before insert
// If there is an encryption choice, we use it to encrypt data before insert
$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
$algo = reset($tmparrays);
if ($algo != '') {
@@ -6479,7 +6479,7 @@ abstract class CommonObject
if (is_object($this->oldcopy)) { // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
//var_dump('iii'.$algo.' '.$this->oldcopy->array_options[$key].' -> '.$this->array_options[$key]);
if (isset($this->oldcopy->array_options[$key]) && $this->array_options[$key] == $this->oldcopy->array_options[$key]) {
// If old value crypted in database is same than submitted new value, it means we don't change it, so we don't update.
// If old value encrypted in database is same than submited new value, it means we don't change it, so we don't update.
if ($algo == 'dolcrypt') { // dolibarr reversible encryption
if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {
$new_array_options[$key] = dolEncrypt($this->array_options[$key]); // warning, must be called when on the master
@@ -6893,7 +6893,7 @@ abstract class CommonObject
case 'password':
$algo = '';
if ($this->array_options["options_".$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
// If there is an encryption choice, we use it to crypt data before insert
// If there is an encryption choice, we use it to encrypt data before insert
$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
$algo = reset($tmparrays);
if ($algo != '') {
@@ -6903,7 +6903,7 @@ abstract class CommonObject
//var_dump($key.' '.$this->array_options["options_".$key].' '.$algo);
if (is_object($this->oldcopy)) { // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
//var_dump($this->oldcopy->array_options["options_".$key]); var_dump($this->array_options["options_".$key]);
if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) { // If old value crypted in database is same than submitted new value, it means we don't change it, so we don't update.
if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) { // If old value encrypted in database is same than submited new value, it means we don't change it, so we don't update.
if ($algo == 'dolcrypt') { // dolibarr reversible encryption
if (!preg_match('/^dolcrypt:/', $this->array_options["options_".$key])) {
$new_array_options["options_".$key] = dolEncrypt($this->array_options["options_".$key]); // warning, must be called when on the master