From 0032b489f359b6107cd85b22f3de928807c4dc4c Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Fri, 21 Apr 2023 20:19:14 +0100 Subject: [PATCH] Merge $tabindex and $idindex into $fieldIndex Signed-off-by: Kamil Tekiela --- libraries/classes/InsertEdit.php | 28 +++++---------- .../Plugins/IOTransformationsPlugin.php | 6 ++-- .../CodeMirrorEditorTransformationPlugin.php | 6 ++-- .../Abs/ImageUploadTransformationsPlugin.php | 6 ++-- .../TextFileUploadTransformationsPlugin.php | 6 ++-- .../Input/Text_Plain_Iptobinary.php | 10 +++--- .../Input/Text_Plain_Iptolong.php | 10 +++--- test/classes/InsertEditTest.php | 36 ++++++++----------- 8 files changed, 39 insertions(+), 69 deletions(-) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 0ba10b5118..87e65d52d1 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -78,7 +78,7 @@ class InsertEdit ]; private int $rowOffset = 0; - private int $tabindex = 0; + private int $fieldIndex = 0; public function __construct( private DatabaseInterface $dbi, @@ -426,7 +426,6 @@ class InsertEdit * @param string $backupField hidden input field * @param string $columnNameAppendix the name attribute * @param string $onChangeClause onchange clause for fields - * @param int $idindex id index * @param string $textDir text direction * @param string $specialCharsEncoded replaced char if the string starts * with a \r\n pair (0x0d0a) add an extra \n @@ -439,7 +438,6 @@ class InsertEdit string $backupField, string $columnNameAppendix, string $onChangeClause, - int $idindex, string $textDir, string $specialCharsEncoded, string $dataType, @@ -470,9 +468,9 @@ class InsertEdit . ' rows="' . $textAreaRows . '"' . ' cols="' . $textareaCols . '"' . ' dir="' . $textDir . '"' - . ' id="field_' . $idindex . '_3"' + . ' id="field_' . $this->fieldIndex . '_3"' . ($onChangeClause ? ' onchange="' . htmlspecialchars($onChangeClause, ENT_COMPAT) . '"' : '') - . ' tabindex="' . $this->tabindex . '"' + . ' tabindex="' . $this->fieldIndex . '"' . ' data-type="' . $dataType . '">' . $specialCharsEncoded . ''; @@ -486,7 +484,6 @@ class InsertEdit * @param string $specialChars special characters * @param int $fieldsize html field size * @param string $onChangeClause onchange clause for fields - * @param int $idindex id index * @param string $dataType the html5 data-* attribute type * * @return string an html snippet @@ -497,7 +494,6 @@ class InsertEdit string $specialChars, int $fieldsize, string $onChangeClause, - int $idindex, string $dataType, ): string { $theClass = 'textfield'; @@ -532,9 +528,9 @@ class InsertEdit . ($inputMinMax ? ' ' . $inputMinMax : '') . ' data-type="' . $dataType . '"' . ' class="' . $theClass . '" onchange="' . htmlspecialchars($onChangeClause, ENT_COMPAT) . '"' - . ' tabindex="' . $this->tabindex . '"' + . ' tabindex="' . $this->fieldIndex . '"' . ($isInteger ? ' inputmode="numeric"' : '') - . ' id="field_' . $idindex . '_3">'; + . ' id="field_' . $this->fieldIndex . '_3">'; } /** @@ -603,7 +599,6 @@ class InsertEdit * @param string $columnNameAppendix the name attribute * @param string $onChangeClause onchange clause for fields * @param string $specialChars special characters - * @param int $idindex id index * @param string $textDir text direction * @param string $specialCharsEncoded replaced char if the string starts * with a \r\n pair (0x0d0a) add an extra \n @@ -621,7 +616,6 @@ class InsertEdit string $columnNameAppendix, string $onChangeClause, string $specialChars, - int $idindex, string $textDir, string $specialCharsEncoded, string $data, @@ -640,7 +634,6 @@ class InsertEdit $backupField, $columnNameAppendix, $onChangeClause, - $idindex, $textDir, $specialCharsEncoded, $dataType, @@ -652,7 +645,6 @@ class InsertEdit $specialChars, $fieldsize, $onChangeClause, - $idindex, $dataType, ); } @@ -1783,8 +1775,7 @@ class InsertEdit $backupField = ''; } - $idindex = ($this->rowOffset * $columnsCnt) + $columnNumber + 1; - $this->tabindex = $idindex; + $this->fieldIndex = ($this->rowOffset * $columnsCnt) + $columnNumber + 1; // The function column // ------------------- @@ -1846,8 +1837,7 @@ class InsertEdit $transformationOptions, $currentValue, $textDir, - $this->tabindex, - $idindex, + $this->fieldIndex, ); $GLOBALS['plugin_scripts'] = array_merge( @@ -1943,7 +1933,6 @@ class InsertEdit $specialChars, min(max($column['len'], 4), $GLOBALS['cfg']['LimitChars']), $onChangeClause, - $idindex, 'HEX', ); } @@ -1955,7 +1944,6 @@ class InsertEdit $columnNameAppendix, $onChangeClause, $specialChars, - $idindex, $textDir, $specialCharsEncoded, $data, @@ -1975,7 +1963,7 @@ class InsertEdit 'function_options' => $functionOptions, 'nullify_code' => $nullifyCode, 'real_null_value' => $realNullValue, - 'id_index' => $idindex, + 'id_index' => $this->fieldIndex, 'type' => $type, 'decimals' => $noDecimals, 'special_chars' => $specialChars, diff --git a/libraries/classes/Plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php index 814bcbabfb..bc17f4aeed 100644 --- a/libraries/classes/Plugins/IOTransformationsPlugin.php +++ b/libraries/classes/Plugins/IOTransformationsPlugin.php @@ -33,8 +33,7 @@ abstract class IOTransformationsPlugin extends TransformationsPlugin * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -45,8 +44,7 @@ abstract class IOTransformationsPlugin extends TransformationsPlugin array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { return ''; } diff --git a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php index be5d0e6227..d0200c56cc 100644 --- a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php @@ -40,8 +40,7 @@ abstract class CodeMirrorEditorTransformationPlugin extends IOTransformationsPlu * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -52,8 +51,7 @@ abstract class CodeMirrorEditorTransformationPlugin extends IOTransformationsPlu array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { $html = ''; if (! empty($value)) { diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php index b4586d6f7b..4b98b88aff 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php @@ -54,8 +54,7 @@ abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -66,8 +65,7 @@ abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { $html = ''; $src = ''; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php index d5ec1ea9ad..ace2274a99 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php @@ -49,8 +49,7 @@ abstract class TextFileUploadTransformationsPlugin extends IOTransformationsPlug * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -61,8 +60,7 @@ abstract class TextFileUploadTransformationsPlugin extends IOTransformationsPlug array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { $html = ''; if (! empty($value)) { diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php index 014909b573..30d41faab4 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php @@ -56,8 +56,7 @@ class Text_Plain_Iptobinary extends IOTransformationsPlugin * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -68,8 +67,7 @@ class Text_Plain_Iptobinary extends IOTransformationsPlugin array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { $html = ''; $val = ''; @@ -93,8 +91,8 @@ class Text_Plain_Iptobinary extends IOTransformationsPlugin . ' size="40"' . ' dir="' . $textDir . '"' . ' class="' . $class . '"' - . ' id="field_' . $idIndex . '_3"' - . ' tabindex="' . ($tabIndex) . '">'; + . ' id="field_' . $fieldIndex . '_3"' + . ' tabindex="' . $fieldIndex . '">'; } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php index 95bbb63484..d16ce8aac5 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php @@ -53,8 +53,7 @@ class Text_Plain_Iptolong extends IOTransformationsPlugin * @param mixed[] $options transformation options * @param string $value Current field value * @param string $textDir text direction - * @param int $tabIndex tab index - * @param int $idIndex id index + * @param int $fieldIndex field index * * @return string the html for input field */ @@ -65,8 +64,7 @@ class Text_Plain_Iptolong extends IOTransformationsPlugin array $options, string $value, string $textDir, - int $tabIndex, - int $idIndex, + int $fieldIndex, ): string { $html = ''; $val = ''; @@ -85,8 +83,8 @@ class Text_Plain_Iptolong extends IOTransformationsPlugin . ' size="40"' . ' dir="' . $textDir . '"' . ' class="transform_IPToLong"' - . ' id="field_' . $idIndex . '_3"' - . ' tabindex="' . ($tabIndex) . '" />'; + . ' id="field_' . $fieldIndex . '_3"' + . ' tabindex="' . $fieldIndex . '" />'; } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 06639686f2..089380a34d 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -602,12 +602,12 @@ class InsertEditTest extends AbstractTestCase $column['is_char'] = true; $column['Type'] = 'char(10)'; $column['True_Type'] = 'char'; - (new ReflectionProperty(InsertEdit::class, 'tabindex'))->setValue($this->insertEdit, 2); + (new ReflectionProperty(InsertEdit::class, 'fieldIndex'))->setValue($this->insertEdit, 2); $result = $this->callFunction( $this->insertEdit, InsertEdit::class, 'getTextarea', - [$column, 'a', 'b', '', 1, 'abc/', 'foobar', 'CHAR'], + [$column, 'a', 'b', '', 'abc/', 'foobar', 'CHAR'], ); $result = $this->parseString($result); @@ -615,7 +615,7 @@ class InsertEditTest extends AbstractTestCase $this->assertStringContainsString( '', $result, ); @@ -786,7 +785,6 @@ class InsertEditTest extends AbstractTestCase 'b', 'c', '<', - 1, '/', '<', "foo\nbar", @@ -797,7 +795,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( "a\n" . '' . '', $result, @@ -816,7 +814,6 @@ class InsertEditTest extends AbstractTestCase 'b', 'c', '<', - 1, '/', '<', "foo\nbar", @@ -841,7 +838,6 @@ class InsertEditTest extends AbstractTestCase 'b', 'c', '<', - 1, '/', '<', "foo\nbar", @@ -866,7 +862,6 @@ class InsertEditTest extends AbstractTestCase 'b', 'c', '<', - 1, '/', '<', "foo\nbar", @@ -891,7 +886,6 @@ class InsertEditTest extends AbstractTestCase 'b', 'c', '<', - 1, '/', '<', "foo\nbar",