From e5fc010f8428c1915f54072f96f4db843bb04783 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Tue, 30 Sep 2025 22:06:00 +0800 Subject: [PATCH] MDL-86800 tool_xmldb: Fix incorrect table borders --- .../admin/tool/xmldb/actions/XMLDBCheckAction.class.php | 2 +- .../xmldb/actions/delete_field/delete_field.class.php | 2 +- .../xmldb/actions/delete_index/delete_index.class.php | 2 +- .../tool/xmldb/actions/delete_key/delete_key.class.php | 2 +- .../xmldb/actions/delete_table/delete_table.class.php | 2 +- .../actions/delete_xml_file/delete_xml_file.class.php | 2 +- .../tool/xmldb/actions/edit_field/edit_field.class.php | 2 +- .../tool/xmldb/actions/edit_index/edit_index.class.php | 2 +- .../admin/tool/xmldb/actions/edit_key/edit_key.class.php | 2 +- .../tool/xmldb/actions/edit_table/edit_table.class.php | 8 ++++---- .../xmldb/actions/edit_xml_file/edit_xml_file.class.php | 4 ++-- .../new_table_from_mysql/new_table_from_mysql.class.php | 2 +- .../xmldb/actions/revert_changes/revert_changes.class.php | 2 +- .../view_reserved_words/view_reserved_words.class.php | 4 ++-- .../view_structure_php/view_structure_php.class.php | 4 ++-- .../view_structure_sql/view_structure_sql.class.php | 2 +- .../xmldb/actions/view_table_php/view_table_php.class.php | 4 ++-- .../xmldb/actions/view_table_sql/view_table_sql.class.php | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/public/admin/tool/xmldb/actions/XMLDBCheckAction.class.php b/public/admin/tool/xmldb/actions/XMLDBCheckAction.class.php index 2ce05f4456e..9d4470dbd52 100644 --- a/public/admin/tool/xmldb/actions/XMLDBCheckAction.class.php +++ b/public/admin/tool/xmldb/actions/XMLDBCheckAction.class.php @@ -93,7 +93,7 @@ abstract class XMLDBCheckAction extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str[$this->introstr] . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/delete_field/delete_field.class.php b/public/admin/tool/xmldb/actions/delete_field/delete_field.class.php index 3cb6d7d51db..922fef987c0 100644 --- a/public/admin/tool/xmldb/actions/delete_field/delete_field.class.php +++ b/public/admin/tool/xmldb/actions/delete_field/delete_field.class.php @@ -76,7 +76,7 @@ class delete_field extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str['confirmdeletefield'] . '

' . $fieldparam . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/delete_index/delete_index.class.php b/public/admin/tool/xmldb/actions/delete_index/delete_index.class.php index 53152b4bd23..51e006a88bc 100644 --- a/public/admin/tool/xmldb/actions/delete_index/delete_index.class.php +++ b/public/admin/tool/xmldb/actions/delete_index/delete_index.class.php @@ -76,7 +76,7 @@ class delete_index extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str['confirmdeleteindex'] . '

' . $indexparam . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/delete_key/delete_key.class.php b/public/admin/tool/xmldb/actions/delete_key/delete_key.class.php index a0b4fb3fcf9..bb824c51676 100644 --- a/public/admin/tool/xmldb/actions/delete_key/delete_key.class.php +++ b/public/admin/tool/xmldb/actions/delete_key/delete_key.class.php @@ -76,7 +76,7 @@ class delete_key extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str['confirmdeletekey'] . '

' . $keyparam . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/delete_table/delete_table.class.php b/public/admin/tool/xmldb/actions/delete_table/delete_table.class.php index eac0d0a5bb1..b53c4d2a186 100644 --- a/public/admin/tool/xmldb/actions/delete_table/delete_table.class.php +++ b/public/admin/tool/xmldb/actions/delete_table/delete_table.class.php @@ -75,7 +75,7 @@ class delete_table extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str['confirmdeletetable'] . '

' . $tableparam . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php b/public/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php index 51218456d86..87cf29ad4d6 100644 --- a/public/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php +++ b/public/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php @@ -74,7 +74,7 @@ class delete_xml_file extends XMLDBAction { $o = ''; $o.= '
'; $o.= '

' . $this->str['confirmdeletexmlfile'] . '

' . $dirpath . '/install.php

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/edit_field/edit_field.class.php b/public/admin/tool/xmldb/actions/edit_field/edit_field.class.php index d48fe8ea5eb..8bf538b6fee 100644 --- a/public/admin/tool/xmldb/actions/edit_field/edit_field.class.php +++ b/public/admin/tool/xmldb/actions/edit_field/edit_field.class.php @@ -114,7 +114,7 @@ class edit_field extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o .= '
'; // XMLDB field name // If the field has dependencies, we cannot change its name $disabled = ''; diff --git a/public/admin/tool/xmldb/actions/edit_index/edit_index.class.php b/public/admin/tool/xmldb/actions/edit_index/edit_index.class.php index ed8d894346b..c88505f2f02 100644 --- a/public/admin/tool/xmldb/actions/edit_index/edit_index.class.php +++ b/public/admin/tool/xmldb/actions/edit_index/edit_index.class.php @@ -106,7 +106,7 @@ class edit_index extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o .= '
'; // XMLDB index name // If the index has dependencies, we cannot change its name $disabled = ''; diff --git a/public/admin/tool/xmldb/actions/edit_key/edit_key.class.php b/public/admin/tool/xmldb/actions/edit_key/edit_key.class.php index 9e78589b994..27a5c9eac56 100644 --- a/public/admin/tool/xmldb/actions/edit_key/edit_key.class.php +++ b/public/admin/tool/xmldb/actions/edit_key/edit_key.class.php @@ -106,7 +106,7 @@ class edit_key extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o .= '
'; // XMLDB key name // If the key has dependencies, we cannot change its name $disabled = ''; diff --git a/public/admin/tool/xmldb/actions/edit_table/edit_table.class.php b/public/admin/tool/xmldb/actions/edit_table/edit_table.class.php index aa82f99d82b..b83b2d8cc2a 100644 --- a/public/admin/tool/xmldb/actions/edit_table/edit_table.class.php +++ b/public/admin/tool/xmldb/actions/edit_table/edit_table.class.php @@ -126,7 +126,7 @@ class edit_table extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o .= '
'; + $o .= '
'; // If the table is being used, we cannot rename it if ($structure->getTableUses($table->getName())) { $o.= ' '; @@ -208,7 +208,7 @@ class edit_table extends XMLDBAction { $fields = $table->getFields(); if (!empty($fields)) { $o .= '

' . $this->str['fields'] . '

'; - $o .= '
Name:' . s($table->getName()) .'
'; + $o .= '
'; $row = 0; foreach ($fields as $field) { // Drag element up/down. @@ -259,7 +259,7 @@ class edit_table extends XMLDBAction { $keys = $table->getKeys(); if (!empty($keys)) { $o .= '

' . $this->str['keys'] . '

'; - $o .= '
'; + $o .= '
'; $row = 0; foreach ($keys as $key) { // Drag element up/down. @@ -305,7 +305,7 @@ class edit_table extends XMLDBAction { $indexes = $table->getIndexes(); if (!empty($indexes)) { $o .= '

' . $this->str['indexes'] . '

'; - $o .= '
'; + $o .= '
'; $row = 0; foreach ($indexes as $index) { // Drag element up/down. diff --git a/public/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php b/public/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php index 115ca27e0a4..0f8962cb09d 100644 --- a/public/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php +++ b/public/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php @@ -116,7 +116,7 @@ class edit_xml_file extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o .= '
'; + $o .= '
'; $o.= ' '; $o.= ' '; $o .= '
Path:' . s($structure->getPath()) . '
Version:' . s($structure->getVersion()) . '
@@ -179,7 +179,7 @@ class edit_xml_file extends XMLDBAction { $tables = $structure->getTables(); if ($tables) { $o .= '

' . $this->str['tables'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($tables as $table) { // Drag element for sortorder. diff --git a/public/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php b/public/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php index ccba5da8401..6d17e4f8ac1 100644 --- a/public/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php +++ b/public/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php @@ -115,7 +115,7 @@ class new_table_from_mysql extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o .= '
'; $o.= ' '; $o.= ' '; $o.= ' '; diff --git a/public/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php b/public/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php index 1f15afa41c9..fa96bda0399 100644 --- a/public/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php +++ b/public/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php @@ -74,7 +74,7 @@ class revert_changes extends XMLDBAction { $o = '
' . html_writer::select($selecttables, 'table') . '' .html_writer::select($aftertables, 'after') . '
[' . $this->str['back'] . ']
'; $o.= '
'; $o.= '

' . $this->str['confirmrevertchanges'] . '

' . $dirpath . '

'; - $o.= '
'; + $o .= '
'; $o.= '
'; $o.= '
'; $o.= '
'; diff --git a/public/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php b/public/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php index a3633840ba7..012abe2210a 100644 --- a/public/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php +++ b/public/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php @@ -103,7 +103,7 @@ class view_reserved_words extends XMLDBAction { // The list of currently wrong field names if ($wronguses) { - $o.= ' '; + $o .= '
'; $o.= ' '; $o.= '
' . $this->str['wrongreservedwords'] . '
'; $o.= '
  • ' . implode('
  • ', $wronguses) . '
'; @@ -112,7 +112,7 @@ class view_reserved_words extends XMLDBAction { } // The textarea showing all the reserved words - $o.= ' '; + $o .= '
'; $o.= ' '; $o .= '
' . $this->str['listreservedwords'].'