diff --git a/libraries/classes/Twig/UrlExtension.php b/libraries/classes/Twig/UrlExtension.php index 1c281008ae..1730268665 100644 --- a/libraries/classes/Twig/UrlExtension.php +++ b/libraries/classes/Twig/UrlExtension.php @@ -11,6 +11,7 @@ namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; +use Twig\TwigFilter; /** * Class UrlExtension @@ -28,27 +29,38 @@ class UrlExtension extends AbstractExtension { return [ new TwigFunction( - 'Url_getHiddenInputs', + 'get_hidden_inputs', 'PhpMyAdmin\Url::getHiddenInputs', ['is_safe' => ['html']] ), new TwigFunction( - 'Url_getHiddenFields', + 'get_hidden_fields', 'PhpMyAdmin\Url::getHiddenFields', ['is_safe' => ['html']] ), new TwigFunction( - 'Url_getCommon', + 'get_common', 'PhpMyAdmin\Url::getCommon', ['is_safe' => ['html']] ), new TwigFunction( - 'Url_getCommonRaw', + 'get_common_raw', 'PhpMyAdmin\Url::getCommonRaw', ['is_safe' => ['html']] ), - new TwigFunction( - 'Url_link', + ]; + } + + /** + * Returns a list of filters to add to the existing list. + * + * @return TwigFilter[] + */ + public function getFilters() + { + return [ + new TwigFilter( + 'link', 'PhpMyAdmin\Core::linkURL' ), ]; diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig index de3301d655..ad7f738363 100644 --- a/templates/columns_definitions/column_definitions_form.twig +++ b/templates/columns_definitions/column_definitions_form.twig @@ -1,7 +1,7 @@
- {{ Url_getHiddenInputs(form_params) }} + {{ get_hidden_inputs(form_params) }} {# happens when an index has been set on a column #} {# and a column is added to the table creation dialog #} {# This contains a JSON-encoded string #} diff --git a/templates/columns_definitions/table_fields_definitions.twig b/templates/columns_definitions/table_fields_definitions.twig index 5dfc6bd25f..9de82d795b 100644 --- a/templates/columns_definitions/table_fields_definitions.twig +++ b/templates/columns_definitions/table_fields_definitions.twig @@ -72,7 +72,7 @@ {% trans 'Browser display transformation' %} @@ -83,7 +83,7 @@ {{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…
If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }} -
{% trans 'Input transformation' %} diff --git a/templates/create_tracking_version.twig b/templates/create_tracking_version.twig index 4a655769ee..4770d01215 100644 --- a/templates/create_tracking_version.twig +++ b/templates/create_tracking_version.twig @@ -1,6 +1,6 @@
- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} {% for selected_table in selected %} {% endfor %} diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig index 1f36427c48..2be943ef96 100644 --- a/templates/database/central_columns/main.twig +++ b/templates/database/central_columns/main.twig @@ -5,7 +5,7 @@ - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
@@ -147,7 +147,7 @@ {% if pos - max_rows >= 0 %}
- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} @@ -157,7 +157,7 @@ {% if tn_nbTotalPage > 1 %} - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} {{ tn_page_selector | raw }} @@ -166,7 +166,7 @@ {% if pos + max_rows < total_rows %}
- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} @@ -191,7 +191,7 @@
{{ Util_getIcon('centralColumns_add', 'Add column' | trans)|raw }} - {{ Url_getHiddenInputs(db) | raw }} + {{ get_hidden_inputs(db) | raw }} @@ -215,7 +215,7 @@
{% if total_rows > 0 %} - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} @@ -269,7 +269,7 @@ {% for row in rows_list %} {# getHtmlForTableRow #} - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
{% trans "Name" %}: diff --git a/templates/database/designer/edit_delete_pages.twig b/templates/database/designer/edit_delete_pages.twig index 5efe362484..fd70c315ef 100644 --- a/templates/database/designer/edit_delete_pages.twig +++ b/templates/database/designer/edit_delete_pages.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
{% endif %} diff --git a/templates/database/designer/page_save_as.twig b/templates/database/designer/page_save_as.twig index a3b6d63943..ea95a7ca43 100644 --- a/templates/database/designer/page_save_as.twig +++ b/templates/database/designer/page_save_as.twig @@ -1,5 +1,5 @@
- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
diff --git a/templates/database/designer/schema_export.twig b/templates/database/designer/schema_export.twig index 9665d7975f..fc5f5c75ff 100644 --- a/templates/database/designer/schema_export.twig +++ b/templates/database/designer/schema_export.twig @@ -1,6 +1,6 @@
- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }} {{ get_choice('Schema', 'export_type', export_list, 'format') }} diff --git a/templates/database/search/main.twig b/templates/database/search/main.twig index 11b5c061b6..324dcc3044 100644 --- a/templates/database/search/main.twig +++ b/templates/database/search/main.twig @@ -1,6 +1,6 @@ - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
{% trans 'Search in database' %}

diff --git a/templates/database/search/results.twig b/templates/database/search/results.twig index efe5529615..3d7a7803c2 100644 --- a/templates/database/search/results.twig +++ b/templates/database/search/results.twig @@ -28,7 +28,7 @@

{% trans 'Browse' %} @@ -37,7 +37,7 @@ {% trans 'Delete' %} diff --git a/templates/database/structure/body_for_table_summary.twig b/templates/database/structure/body_for_table_summary.twig index e0da06ebfc..d9a97d9d88 100644 --- a/templates/database/structure/body_for_table_summary.twig +++ b/templates/database/structure/body_for_table_summary.twig @@ -29,7 +29,7 @@ {% if approx_rows %} {% set cell_text -%} ~ + {{- get_common(row_sum_url) }}" class="ajax row_count_sum">~ {{- row_count_sum -}} {%- endset %} diff --git a/templates/database/structure/favorite_anchor.twig b/templates/database/structure/favorite_anchor.twig index 34a97b39a1..91e002e216 100644 --- a/templates/database/structure/favorite_anchor.twig +++ b/templates/database/structure/favorite_anchor.twig @@ -1,6 +1,6 @@ {{ already_favorite ? titles['Favorite']|raw : titles['NoFavorite']|raw }} diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index 5bcc62d8c4..800db544b9 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -88,7 +88,7 @@ {% if approx_rows %} - -{{ Url_getHiddenInputs(db) }} +{{ get_hidden_inputs(db) }}
diff --git a/templates/database/structure/tracking_icon.twig b/templates/database/structure/tracking_icon.twig index ca7e894b34..80280cd9bf 100644 --- a/templates/database/structure/tracking_icon.twig +++ b/templates/database/structure/tracking_icon.twig @@ -1,4 +1,4 @@ - + {% if is_tracked -%} {{ Util_getImage('eye', 'Tracking is active.'|trans) }} {%- else -%} diff --git a/templates/database/tracking/tables.twig b/templates/database/tracking/tables.twig index 46e4a5aabe..3a9bd4b27c 100644 --- a/templates/database/tracking/tables.twig +++ b/templates/database/tracking/tables.twig @@ -5,7 +5,7 @@ - {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
@@ -90,7 +90,7 @@

{% trans 'Untracked tables' %}

- {{ Url_getHiddenInputs(db) }} + {{ get_hidden_inputs(db) }}
diff --git a/templates/display/export/hidden_inputs.twig b/templates/display/export/hidden_inputs.twig index fa01a18759..fc7c04ef91 100644 --- a/templates/display/export/hidden_inputs.twig +++ b/templates/display/export/hidden_inputs.twig @@ -1,9 +1,9 @@ {% if export_type == 'server' %} - {{ Url_getHiddenInputs('', '', 1) }} + {{ get_hidden_inputs('', '', 1) }} {% elseif export_type == 'database' %} - {{ Url_getHiddenInputs(db, '', 1) }} + {{ get_hidden_inputs(db, '', 1) }} {% else %} - {{ Url_getHiddenInputs(db, table, 1) }} + {{ get_hidden_inputs(db, table, 1) }} {% endif %} {# Just to keep this value for possible next display of this form after saving on server #} diff --git a/templates/display/import/import.twig b/templates/display/import/import.twig index aaf609886e..205ed3a51e 100644 --- a/templates/display/import/import.twig +++ b/templates/display/import/import.twig @@ -25,11 +25,11 @@ {% if import_type == 'server' %} - {{ Url_getHiddenInputs('', '', 1) }} + {{ get_hidden_inputs('', '', 1) }} {% elseif import_type == 'database' %} - {{ Url_getHiddenInputs(db, '', 1) }} + {{ get_hidden_inputs(db, '', 1) }} {% else %} - {{ Url_getHiddenInputs(db, table, 1) }} + {{ get_hidden_inputs(db, table, 1) }} {% endif %} diff --git a/templates/display/import/javascript.twig b/templates/display/import/javascript.twig index 01bd199f39..52f70920da 100644 --- a/templates/display/import/javascript.twig +++ b/templates/display/import/javascript.twig @@ -6,7 +6,7 @@ $( function() { {% if handler != 'PhpMyAdmin\\Plugins\\Import\\Upload\\UploadNoplugin' %} {# Some variable for javascript #} - {% set ajax_url = 'import_status.php?id=' ~ upload_id ~ '&' ~ Url_getCommonRaw({ + {% set ajax_url = 'import_status.php?id=' ~ upload_id ~ '&' ~ get_common_raw({ 'import_status': 1 }) %} {% set promot_str = Sanitize_jsFormat( @@ -21,7 +21,7 @@ $( function() { 'The file is being processed, please be patient.'|trans, false ) %} - {% set import_url = Url_getCommonRaw({'import_status': 1}) %} + {% set import_url = get_common_raw({'import_status': 1}) %} {% set upload_html %} {% spaceless %} diff --git a/templates/display/results/multi_row_operations_form.twig b/templates/display/results/multi_row_operations_form.twig index bf87c7e0d0..113b3ebe4e 100644 --- a/templates/display/results/multi_row_operations_form.twig +++ b/templates/display/results/multi_row_operations_form.twig @@ -4,7 +4,7 @@ name="resultsForm" id="resultsForm_{{ unique_id }}" class="ajax"> - {{ Url_getHiddenInputs(db, table, 1) }} + {{ get_hidden_inputs(db, table, 1) }} {% endif %} diff --git a/templates/display/results/options_block.twig b/templates/display/results/options_block.twig index 465f9e3467..4845a0d386 100644 --- a/templates/display/results/options_block.twig +++ b/templates/display/results/options_block.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs({ + {{ get_hidden_inputs({ 'db': db, 'table': table, 'sql_query': sql_query, diff --git a/templates/display/results/show_all_checkbox.twig b/templates/display/results/show_all_checkbox.twig index b2674d3893..d924952900 100644 --- a/templates/display/results/show_all_checkbox.twig +++ b/templates/display/results/show_all_checkbox.twig @@ -1,6 +1,6 @@ {% endif %} diff --git a/templates/server/engines/show_engine.twig b/templates/server/engines/show_engine.twig index 7744ed1ce3..279a398138 100644 --- a/templates/server/engines/show_engine.twig +++ b/templates/server/engines/show_engine.twig @@ -12,7 +12,7 @@ {% trans 'Variables' %} {% else %} + {{- get_common({'engine': engine}) }}"> {% trans 'Variables' %} {% endif %} @@ -22,7 +22,7 @@ {{ label }} {% else %} + {{- get_common({'engine': engine, 'page': current}) }}"> {{ label }} {% endif %} diff --git a/templates/server/privileges/add_user_fieldset.twig b/templates/server/privileges/add_user_fieldset.twig index 6483ec8567..9774e10dce 100644 --- a/templates/server/privileges/add_user_fieldset.twig +++ b/templates/server/privileges/add_user_fieldset.twig @@ -1,8 +1,8 @@
{% trans %}New{% context %}Create new user{% endtrans %} - {{ Util_getIcon('b_usradd') }}{% trans 'Add user account' %}
diff --git a/templates/server/privileges/choose_user_group.twig b/templates/server/privileges/choose_user_group.twig index 64a2e223d2..f0c3b5aa0f 100644 --- a/templates/server/privileges/choose_user_group.twig +++ b/templates/server/privileges/choose_user_group.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs(params) }} + {{ get_hidden_inputs(params) }}
{% trans 'User group' %} {% trans 'User group' %}: diff --git a/templates/server/privileges/edit_routine_privileges.twig b/templates/server/privileges/edit_routine_privileges.twig index 461edbdc09..cf9c924865 100644 --- a/templates/server/privileges/edit_routine_privileges.twig +++ b/templates/server/privileges/edit_routine_privileges.twig @@ -1,7 +1,7 @@
{{ header }} - {{ Url_getHiddenInputs() }} + {{ get_hidden_inputs() }} diff --git a/templates/server/privileges/initials_row.twig b/templates/server/privileges/initials_row.twig index a36e14216d..95fa1034e6 100644 --- a/templates/server/privileges/initials_row.twig +++ b/templates/server/privileges/initials_row.twig @@ -6,7 +6,7 @@ + {{- get_common({'initial': tmp_initial}) }}"> {{- tmp_initial|raw -}} @@ -16,7 +16,7 @@ {% endfor %}
diff --git a/templates/table/chart/tbl_chart.twig b/templates/table/chart/tbl_chart.twig index 1458690bf3..09706aab6c 100644 --- a/templates/table/chart/tbl_chart.twig +++ b/templates/table/chart/tbl_chart.twig @@ -4,7 +4,7 @@ {# Display Chart options #}
- {{ Url_getHiddenInputs(url_params) }} + {{ get_hidden_inputs(url_params) }}
{% trans 'Display chart' %} diff --git a/templates/table/gis_visualization/gis_visualization.twig b/templates/table/gis_visualization/gis_visualization.twig index 111b216a21..c7016b4185 100644 --- a/templates/table/gis_visualization/gis_visualization.twig +++ b/templates/table/gis_visualization/gis_visualization.twig @@ -3,7 +3,7 @@ {% trans 'Display GIS Visualization' %}
- {{ Url_getHiddenInputs(url_params) }} + {{ get_hidden_inputs(url_params) }} diff --git a/templates/table/index_form.twig b/templates/table/index_form.twig index 72f477411c..59e04ecf86 100644 --- a/templates/table/index_form.twig +++ b/templates/table/index_form.twig @@ -4,7 +4,7 @@ id="index_frm" class="ajax"> - {{ Url_getHiddenInputs(form_params) }} + {{ get_hidden_inputs(form_params) }}
diff --git a/templates/table/insert/continue_insertion_form.twig b/templates/table/insert/continue_insertion_form.twig index c39a96f3e8..86a821549e 100644 --- a/templates/table/insert/continue_insertion_form.twig +++ b/templates/table/insert/continue_insertion_form.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig index 18fe838abc..83c36a76cf 100644 --- a/templates/table/relation/common_form.twig +++ b/templates/table/relation/common_form.twig @@ -2,7 +2,7 @@ {% block content %} - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} {# InnoDB #} {% if Util_isForeignKeySupported(tbl_storage_engine) %}
diff --git a/templates/table/relation/foreign_key_row.twig b/templates/table/relation/foreign_key_row.twig index 5527293e27..1f42bd70d3 100644 --- a/templates/table/relation/foreign_key_row.twig +++ b/templates/table/relation/foreign_key_row.twig @@ -26,7 +26,7 @@ {% if one_key['constraint'] is defined %} - {% set drop_url = 'sql.php' ~ Url_getCommon(this_params) %} + {% set drop_url = 'sql.php' ~ get_common(this_params) %} {% set drop_str = Util_getIcon('b_drop', 'Drop'|trans) %} {{ Util_linkOrButton(drop_url, drop_str, {'class': 'drop_foreign_key_anchor ajax'}) }} {% endif %} diff --git a/templates/table/search/form_tag.twig b/templates/table/search/form_tag.twig index 827c051f3d..d35d302fb9 100644 --- a/templates/table/search/form_tag.twig +++ b/templates/table/search/form_tag.twig @@ -1,4 +1,4 @@ - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/table/search/input_box.twig b/templates/table/search/input_box.twig index 82f13b525a..f098cbb3d9 100644 --- a/templates/table/search/input_box.twig +++ b/templates/table/search/input_box.twig @@ -22,7 +22,7 @@ {% endif %} /> {{ titles['Browse']|replace({"'": "\\'"})|raw }} @@ -35,7 +35,7 @@ class="textfield" id="field_{{ column_index }}" /> {% if in_fbs %} - {% set edit_url = 'gis_data_editor.php' ~ Url_getCommon() %} + {% set edit_url = 'gis_data_editor.php' ~ get_common() %} {% set edit_str = Util_getIcon('b_edit', 'Edit/Insert'|trans) %} {{ Util_linkOrButton(edit_url, edit_str, [], '_blank') }} diff --git a/templates/table/search/replace_preview.twig b/templates/table/search/replace_preview.twig index dab10f08f9..7761d31ba3 100644 --- a/templates/table/search/replace_preview.twig +++ b/templates/table/search/replace_preview.twig @@ -2,7 +2,7 @@ action="tbl_find_replace.php" name="previewForm" id="previewForm"> - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/table/search/zoom_result_form.twig b/templates/table/search/zoom_result_form.twig index 3d96fb4942..25f72ac39d 100644 --- a/templates/table/search/zoom_result_form.twig +++ b/templates/table/search/zoom_result_form.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/table/structure/display_partitions.twig b/templates/table/structure/display_partitions.twig index c6ea956e0b..fa6208d0cb 100644 --- a/templates/table/structure/display_partitions.twig +++ b/templates/table/structure/display_partitions.twig @@ -129,7 +129,7 @@
{% if not tbl_is_view and not db_is_system_schema %}
- {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} {% if Util_showIcons('ActionLinksMode') %} {{ Util_getImage('b_insrow', 'Add column'|trans) }}  {% endif %} diff --git a/templates/table/structure/partition_definition_form.twig b/templates/table/structure/partition_definition_form.twig index 186a6c71f1..69007ce7d1 100644 --- a/templates/table/structure/partition_definition_form.twig +++ b/templates/table/structure/partition_definition_form.twig @@ -1,5 +1,5 @@ - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }}
diff --git a/templates/table/tracking/main.twig b/templates/table/tracking/main.twig index 10e39ef23d..37370c5f12 100644 --- a/templates/table/tracking/main.twig +++ b/templates/table/tracking/main.twig @@ -1,6 +1,6 @@ {% if selectable_tables_num_rows > 0 %} - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }}
- {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/display/results/table_navigation_button.twig b/templates/display/results/table_navigation_button.twig index eb4fa42e64..e0254a0bf5 100644 --- a/templates/display/results/table_navigation_button.twig +++ b/templates/display/results/table_navigation_button.twig @@ -1,6 +1,6 @@ - {{ Url_getHiddenInputs(db, table) }} + {{ get_hidden_inputs(db, table) }} diff --git a/templates/login/header.twig b/templates/login/header.twig index c8b555e169..b0a5e18d6a 100644 --- a/templates/login/header.twig +++ b/templates/login/header.twig @@ -1,5 +1,5 @@
-

{{ 'Welcome to %s'|trans|format('phpMyAdmin')|raw }}

diff --git a/templates/login/twofactor.twig b/templates/login/twofactor.twig index 52ca9c88ee..a12e8c77c7 100644 --- a/templates/login/twofactor.twig +++ b/templates/login/twofactor.twig @@ -1,5 +1,5 @@ -{{ Url_getHiddenInputs() }} +{{ get_hidden_inputs() }} {{ form|raw }} {% if show_submit %} diff --git a/templates/login/twofactor/application_configure.twig b/templates/login/twofactor/application_configure.twig index 97b069da28..1bf6d6b9e8 100644 --- a/templates/login/twofactor/application_configure.twig +++ b/templates/login/twofactor/application_configure.twig @@ -1,4 +1,4 @@ -{{ Url_getHiddenInputs() }} +{{ get_hidden_inputs() }} {% if image is defined %}

{% trans "Please scan following QR code into the two-factor authentication app on your device and enter authentication code it generates." %} diff --git a/templates/prefs_twofactor.twig b/templates/prefs_twofactor.twig index e32ec21ef0..e72c97ff4f 100644 --- a/templates/prefs_twofactor.twig +++ b/templates/prefs_twofactor.twig @@ -33,7 +33,7 @@

{% trans "You have enabled two factor authentication." %}

{{ backend_description }}

-{{ Url_getHiddenInputs() }} +{{ get_hidden_inputs() }}
@@ -43,7 +43,7 @@

{% trans "Configure two-factor authentication" %}

-{{ Url_getHiddenInputs() }} +{{ get_hidden_inputs() }} {% for backend in backends %}
- + {% trans 'Database' %} {{ sort_by == 'SCHEMA_NAME' ? Util_getImage( 's_' ~ sort_order, @@ -99,7 +99,7 @@ }) %} - + {{ stat['disp_name'] }} {{ sort_by == stat_name ? Util_getImage( 's_' ~ sort_order, diff --git a/templates/server/databases/table_row.twig b/templates/server/databases/table_row.twig index 68ae4efd8e..9acc2c4138 100644 --- a/templates/server/databases/table_row.twig +++ b/templates/server/databases/table_row.twig @@ -9,7 +9,7 @@ {% endif %} {{ current['SCHEMA_NAME'] }} @@ -44,7 +44,7 @@ - + {{ details['Engine'] }} + {{- get_common({'showall': 1}) }}" class="nowrap"> {% trans 'Show all' %}
@@ -63,14 +63,14 @@
{{ Util_getIcon('b_report', 'Tracking report'|trans) }}    {{ Util_getIcon('b_props', 'Structure snapshot'|trans) }} @@ -96,7 +96,7 @@ {% set last_version_element = versions|first %}