composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3430 - code cleanup

Browse Source 
- during the code review @dflaven preferred the reference rather than the return alternative
 - typo
This commit is contained in:
bruno-ds
2021-02-22 09:42:24 +01:00
parent 71c5f47cd8
commit 241bd1cdeb
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
View File

@@ -1051,7 +1051,7 @@ class ObjectFormManager extends FormManager
/**
* @inheritDoc
*/
public function CheckTransaction($aData)
public function CheckTransaction(&$aData)
{
$isTransactionValid = \utils::IsTransactionValid($this->oForm->GetTransactionId(), false); //The transaction token is kept in order to preserve BC with ajax forms (the second call would fail if the token is deleted). (The GC will take care of cleaning the token for us later on)
if (!$isTransactionValid) {
@@ -1066,8 +1066,6 @@ class ObjectFormManager extends FormManager
];
$aData['valid'] = false;
}
return $aData;
}
/**

2
dictionaries/en.dictionary.itop.ui.php
View File

@@ -465,7 +465,7 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Error:InvalidDashboard' => 'Error: invalid dashboard',
'UI:Error:MaintenanceMode' => 'Application is currently in maintenance',
'UI:Error:MaintenanceTitle' => 'Maintenance',
'UI:Error:InvalidToken' => 'Error: the requested operation have already been performed (CSRF token not found)',
'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)',
'UI:GroupBy:Count' => 'Count',
'UI:GroupBy:Count+' => 'Number of elements',

6
sources/form/formmanager.class.inc.php
View File

@@ -175,7 +175,7 @@ abstract class FormManager
),
);
$aData = $this->CheckTransaction($aData);
$this->CheckTransaction($aData);
return $aData;
}
@@ -187,7 +187,7 @@ abstract class FormManager
*
* @since 2.7.4 3.0.0 N°3430
*/
public function CheckTransaction($aData)
public function CheckTransaction(&$aData)
{
$isTransactionValid = \utils::IsTransactionValid($this->oForm->GetTransactionId(), false); //The transaction token is kept in order to preserve BC with ajax forms (the second call would fail if the token is deleted). (The GC will take care of cleaning the token for us later on)
if (!$isTransactionValid) {
@@ -196,8 +196,6 @@ abstract class FormManager
];
$aData['valid'] = false;
}
return $aData;
}
/**