gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invert <pre> and <code>

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2025-05-12 20:52:18 +01:00
parent d78db42edc
commit 05892fb923
15 changed files with 61 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/themes/bootstrap/scss/_common.scss
View File

@ -1225,15 +1225,6 @@ input#auto_increment_opt {
position: static;
}
tbody td span {
display: block;
overflow: hidden;
code span {
display: inline;
}
}
th.draggable {
span {
margin-right: 10px;
@ -2400,3 +2391,7 @@ body .ui-dialog {
.table-responsive-md .data {
z-index: 9;
}
pre {
margin: 0;
}

13
public/themes/metro/scss/_common.scss
View File

@ -1489,15 +1489,6 @@ input#auto_increment_opt {
td {
position: static;
}
tbody td span {
display: block;
overflow: hidden;
code span {
display: inline;
}
}
}
.modal-copy input {
@ -2577,3 +2568,7 @@ body {
.table-responsive-md .data {
z-index: 9;
}
pre {
margin: 0;
}

13
public/themes/original/scss/_common.scss
View File

@ -1229,15 +1229,6 @@ input#auto_increment_opt {
td {
position: static;
}
tbody td span {
display: block;
overflow: hidden;
code span {
display: inline;
}
}
}
.modal-copy input {
@ -2402,3 +2393,7 @@ body {
.table-responsive-md .data {
z-index: 9;
}
pre {
margin: 0;
}

13
public/themes/pmahomme/scss/_common.scss
View File

@ -1432,15 +1432,6 @@ input#auto_increment_opt {
position: static;
}
tbody td span {
display: block;
overflow: hidden;
code span {
display: inline;
}
}
th.draggable {
span {
margin-right: 10px;
@ -2553,3 +2544,7 @@ body .ui-dialog {
.bg-secondary {
color: #333;
}
pre {
margin: 0;
}

8
resources/js/src/modules/sql-highlight.ts
View File

@ -459,15 +459,15 @@ export default function highlightSql ($base) {
var $elm = $base.find('code.sql');
$elm.each(function () {
var $sql = $(this);
var $pre = $sql.find('pre');
var $pre = $sql.closest('pre');
/* We only care about visible elements to avoid double processing */
if ($pre.is(':visible')) {
if ($sql.is(':visible')) {
var $highlight = $('<div class="sql-highlight cm-s-default"></div>');
$sql.append($highlight);
$pre.append($highlight);
if (typeof window.CodeMirror !== 'undefined') {
// @ts-ignore
window.CodeMirror.runMode($sql.text(), 'text/x-mysql', $highlight[0]);
$pre.hide();
$sql.hide();
$highlight.find('.cm-keyword').each(documentationKeyword);
$highlight.find('.cm-builtin').each(documentationBuiltin);
}

8
resources/js/src/transformations/json.ts
View File

@ -8,14 +8,14 @@ AJAX.registerOnload('transformations/json.js', function () {
var $elm = $('#page_content').find('code.json');
$elm.each(function () {
var $json = $(this);
var $pre = $json.find('pre');
var $pre = $json.closest('pre');
/* We only care about visible elements to avoid double processing */
if ($pre.is(':visible')) {
if ($json.is(':visible')) {
var $highlight = $('<div class="json-highlight cm-s-default"></div>');
$json.append($highlight);
$pre.append($highlight);
// @ts-ignore
window.CodeMirror.runMode($json.text(), 'application/json', $highlight[0]);
$pre.hide();
$json.hide();
}
});
});

8
resources/js/src/transformations/xml.ts
View File

@ -8,14 +8,14 @@ AJAX.registerOnload('transformations/xml.js', function () {
var $elm = $('#page_content').find('code.xml');
$elm.each(function () {
var $json = $(this);
var $pre = $json.find('pre');
var $pre = $json.closest('pre');
/* We only care about visible elements to avoid double processing */
if ($pre.is(':visible')) {
if ($json.is(':visible')) {
var $highlight = $('<div class="xml-highlight cm-s-default"></div>');
$json.append($highlight);
$pre.append($highlight);
// @ts-ignore
window.CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]);
$pre.hide();
$json.hide();
}
});
});

14
src/Html/Generator.php
View File

@ -450,12 +450,12 @@ class Generator
/* SQL-Parser-Analyzer */
if (Sql::$showAsPhp === true) {
$newLine = '\\n"<br>' . "\n" . '&nbsp;&nbsp;&nbsp;&nbsp;. "';
$newLine = '\\n"' . "\n" . ' . "';
$queryBase = htmlspecialchars(addslashes($sqlQuery));
$queryBase = preg_replace('/((\015\012)|(\015)|(\012))/', $newLine, $queryBase);
$queryBase = '<code class="php" dir="ltr"><pre>' . "\n"
. '$sql = "' . $queryBase . '";' . "\n"
. '</pre></code>';
$queryBase = '<pre><code class="php" dir="ltr">'
. '$sql = "' . $queryBase . '";'
. '</code></pre>';
} else {
$queryBase = self::formatSql($sqlQuery, true);
}
@ -1072,9 +1072,9 @@ class Generator
$sqlQuery = mb_substr($sqlQuery, 0, $config->settings['MaxCharactersInDisplayedSQL']) . '[...]';
}
return '<code class="sql" dir="ltr"><pre>' . "\n"
. htmlspecialchars($sqlQuery, ENT_COMPAT) . "\n"
. '</pre></code>';
return '<pre><code class="sql" dir="ltr">'
. htmlspecialchars($sqlQuery, ENT_COMPAT)
. '</code></pre>';
}
/**

4
src/Plugins/Transformations/Output/Text_Plain_Json.php
View File

@ -52,9 +52,7 @@ class Text_Plain_Json extends TransformationsPlugin
*/
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
{
return '<code class="json"><pre>' . "\n"
. htmlspecialchars($buffer) . "\n"
. '</pre></code>';
return '<pre><code class="json">' . htmlspecialchars($buffer) . '</code></pre>';
}
/* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */

4
src/Plugins/Transformations/Output/Text_Plain_Xml.php
View File

@ -52,9 +52,7 @@ class Text_Plain_Xml extends TransformationsPlugin
*/
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
{
return '<code class="xml"><pre>' . "\n"
. htmlspecialchars($buffer) . "\n"
. '</pre></code>';
return '<pre><code class="xml">' . htmlspecialchars($buffer) . '</code></pre>';
}
/* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */

6
tests/unit/Controllers/Server/PrivilegesControllerTest.php
View File

@ -148,10 +148,10 @@ class PrivilegesControllerTest extends AbstractTestCase
self::assertStringContainsString("You have updated the privileges for 'pma_test'@'localhost'.", $output);
// phpcs:disable Generic.Files.LineLength.TooLong
$expectedSql = '<pre>' . "\n"
$expectedSql = '<pre><code class="sql" dir="ltr">'
. "REVOKE ALL PRIVILEGES ON `test_db_1`.* FROM 'pma_test'@'localhost'; REVOKE GRANT OPTION ON `test_db_1`.* FROM 'pma_test'@'localhost'; GRANT SELECT ON `test_db_1`.* TO 'pma_test'@'localhost'; \n"
. "REVOKE ALL PRIVILEGES ON `test_db_2`.* FROM 'pma_test'@'localhost'; REVOKE GRANT OPTION ON `test_db_2`.* FROM 'pma_test'@'localhost'; GRANT SELECT ON `test_db_2`.* TO 'pma_test'@'localhost'; \n"
. '</pre>';
. "REVOKE ALL PRIVILEGES ON `test_db_2`.* FROM 'pma_test'@'localhost'; REVOKE GRANT OPTION ON `test_db_2`.* FROM 'pma_test'@'localhost'; GRANT SELECT ON `test_db_2`.* TO 'pma_test'@'localhost'; "
. '</code></pre>';
// phpcs:enable
self::assertStringContainsString($expectedSql, $output);

8
tests/unit/Controllers/Table/FindReplaceControllerTest.php
View File

@ -54,10 +54,10 @@ final class FindReplaceControllerTest extends AbstractTestCase
$controller($request);
self::assertStringContainsString(
'<pre>' . "\n"
'<pre><code class="sql" dir="ltr">'
. 'UPDATE `test_table` SET `id` = REPLACE(`id`, \'Field\', \'Column\')'
. ' WHERE `id` LIKE \'%Field%\' COLLATE utf8mb4_bin'
. "\n" . '</pre>',
. '</code></pre>',
$responseRenderer->getHTMLResult(),
);
self::assertSame([], $responseRenderer->getJSONResult());
@ -102,9 +102,9 @@ final class FindReplaceControllerTest extends AbstractTestCase
$controller($request);
self::assertStringContainsString(
'<pre>' . "\n"
'<pre><code class="sql" dir="ltr">'
. 'UPDATE `test_table` SET `id` = `id` WHERE `id` RLIKE \'Field\' COLLATE utf8mb4_bin'
. "\n" . '</pre>',
. '</code></pre>',
$responseRenderer->getHTMLResult(),
);
self::assertSame([], $responseRenderer->getJSONResult());

12
tests/unit/Controllers/Table/IndexRenameControllerTest.php
View File

@ -87,14 +87,14 @@ class IndexRenameControllerTest extends AbstractTestCase
$dbi->setVersion(['@@version' => '5.5.0']);
DatabaseInterface::$instance = $dbi;
// phpcs:disable Generic.Files.LineLength.TooLong
$expected = <<<'HTML'
<div class="preview_sql">
<code class="sql" dir="ltr"><pre>
ALTER TABLE `test_db`.`test_table_index_rename` DROP INDEX `old_name`, ADD INDEX `new_name` (`name`) USING BTREE;
</pre></code>
</div>
<div class="preview_sql">
<pre><code class="sql" dir="ltr">ALTER TABLE `test_db`.`test_table_index_rename` DROP INDEX `old_name`, ADD INDEX `new_name` (`name`) USING BTREE;</code></pre>
</div>
HTML;
HTML;
// phpcs:enable
$request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/')
->withQueryParams(['db' => 'test_db', 'table' => 'test_table_index_rename'])

20
tests/unit/Html/GeneratorTest.php
View File

@ -277,18 +277,18 @@ class GeneratorTest extends AbstractTestCase
public function testFormatSql(): void
{
self::assertSame(
'<code class="sql" dir="ltr"><pre>' . "\n"
. 'SELECT 1 &lt; 2' . "\n"
. '</pre></code>',
'<pre><code class="sql" dir="ltr">'
. 'SELECT 1 &lt; 2'
. '</code></pre>',
Generator::formatSql('SELECT 1 < 2'),
);
Config::getInstance()->settings['MaxCharactersInDisplayedSQL'] = 6;
self::assertSame(
'<code class="sql" dir="ltr"><pre>' . "\n"
. 'SELECT[...]' . "\n"
. '</pre></code>',
'<pre><code class="sql" dir="ltr">'
. 'SELECT[...]'
. '</code></pre>',
Generator::formatSql('SELECT 1 < 2', true),
);
}
@ -486,9 +486,7 @@ class GeneratorTest extends AbstractTestCase
<div class="alert alert-primary border-top-0 border-start-0 border-end-0 rounded-bottom-0 mb-0" role="alert">
<img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice"> Message <em>one</em>.
</div>
<div class="card-body sqlOuter"><code class="sql" dir="ltr"><pre>
SELECT 1;
</pre></code></div>
<div class="card-body sqlOuter"><pre><code class="sql" dir="ltr">SELECT 1;</code></pre></div>
<div class="card-footer tools d-print-none">
<div class="row align-items-center">
<div class="col-auto">
@ -535,9 +533,7 @@ HTML;
<div class="alert alert-success border-top-0 border-start-0 border-end-0 rounded-bottom-0 mb-0" role="alert">
<img src="themes/dot.gif" title="" alt="" class="icon ic_s_success"> Message <em>one</em>.
</div>
<div class="card-body sqlOuter"><code class="php" dir="ltr"><pre>
$sql = "EXPLAIN SELECT 1;";
</pre></code></div>
<div class="card-body sqlOuter"><pre><code class="php" dir="ltr">$sql = "EXPLAIN SELECT 1;";</code></pre></div>
<div class="card-footer tools d-print-none">
<div class="row align-items-center">
<div class="col-auto">

6
tests/unit/Plugins/Transformations/TransformationPluginsTest.php
View File

@ -564,9 +564,9 @@ class TransformationPluginsTest extends AbstractTestCase
[
new Text_Plain_Sql(),
['select *', ['option1', 'option2']],
'<code class="sql" dir="ltr"><pre>' . "\n"
. 'select *' . "\n"
. '</pre></code>',
'<pre><code class="sql" dir="ltr">'
. 'select *'
. '</code></pre>',
],
[new Text_Plain_Link(), ['PMA_TXT_LINK', ['./php/', 'text_name']], './php/PMA_TXT_LINK'],
[new Text_Plain_Link(), ['PMA_TXT_LINK', []], 'PMA_TXT_LINK'],