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

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Gemorroj 2018-08-04 08:44:50 +03:00
commit 617dc5c677
129 changed files with 1264 additions and 2203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
- issue #14435 Event scheduler status toggle doesn't work
- issue #14365 View not working on multiple servers
- issue #14207 Partition actions in table structure do not work
- issue #14375 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table
4.8.2 (2018-06-21)
- issue #14370 WHERE 0 causes Fatal error

27
libraries/classes/CentralColumns.php
View File

@ -1078,6 +1078,33 @@ class CentralColumns
return -1;
}
/**
* build dropdown select html to select column in selected table,
* include only columns which are not already in central list
*
* @param string $db current database to which selected table belongs
* @param string $selected_tbl selected table
*
* @return string html to select column
*/
public function getHtmlForColumnDropdown($db, $selected_tbl)
{
$existing_cols = $this->getFromTable($db, $selected_tbl);
$this->dbi->selectDb($db);
$columns = (array) $this->dbi->getColumnNames(
$db, $selected_tbl
);
$selectColHtml = "";
foreach ($columns as $column) {
if (!in_array($column, $existing_cols)) {
$selectColHtml .= '<option value="' . htmlspecialchars($column) . '">'
. htmlspecialchars($column)
. '</option>';
}
}
return $selectColHtml;
}
/**
* build html for adding a new user defined column to central list
*

3
libraries/classes/Controllers/Table/TableStructureController.php
View File

@ -1353,12 +1353,14 @@ class TableStructureController extends TableController
}
$engine = $this->table_obj->getStorageEngine();
$foreignKeySupported = Util::isForeignKeySupported($engine);
return $this->template->render('table/structure/display_structure', [
'url_params' => [
'db' => $this->db,
'table' => $this->table,
],
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'displayIndexesHtml' => $foreignKeySupported ? Index::getHtmlForDisplayIndexes() : null,
'cfg_relation' => $this->relation->getRelationsParam(),
'hide_structure_actions' => $hideStructureActions,
'db' => $this->db,
@ -1390,6 +1392,7 @@ class TableStructureController extends TableController
'text_dir' => $GLOBALS['text_dir'],
'is_active' => Tracker::isActive(),
'have_partitioning' => Partition::havePartitioning(),
'partitions' => Partition::getPartitions($this->db, $this->table),
'partition_names' => Partition::getPartitionNames($this->db, $this->table),
'attributes' => $attributes,
'displayed_fields' => $displayed_fields,

4
libraries/classes/Export.php
View File

@ -535,10 +535,10 @@ class Export
foreach ($_POST as $name => $value) {
if (is_array($value)) {
foreach ($value as $val) {
$refreshButton .= '<input type="hidden" name="' . $name . '[]" value="' . $val . '">';
$refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '[]" value="' . urlencode((string) $val) . '">';
}
} else {
$refreshButton .= '<input type="hidden" name="' . $name . '" value="' . $value . '">';
$refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '" value="' . urlencode((string) $value) . '">';
}
}
$refreshButton .= '</form>';

6
libraries/classes/InsertEdit.php
View File

@ -986,8 +986,8 @@ class InsertEdit
* @todo clarify the meaning of the "textfield" class and explain
* why character columns have the "char" class instead
*/
$the_class = 'char';
$textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
$the_class = 'char charField';
$textAreaRows = max($GLOBALS['cfg']['CharTextareaRows'], 7);
$textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
$extracted_columnspec = Util::extractColumnSpec(
$column['Type']
@ -1950,7 +1950,7 @@ class InsertEdit
}
$html_output .= '<th>' . __('Null') . '</th>'
. '<th>' . __('Value') . '</th>'
. '<th class="fillPage">' . __('Value') . '</th>'
. '</tr>'
. '</thead>'
. ' <tfoot>'

20
libraries/classes/Server/Privileges.php
View File

@ -492,7 +492,7 @@ class Privileges
$name_for_dfn,
$name_for_current
) {
return $this->template->render('privileges/column_privileges', [
return $this->template->render('server/privileges/column_privileges', [
'columns' => $columns,
'row' => $row,
'name_for_select' => $name_for_select,
@ -573,7 +573,7 @@ class Privileges
}
$GLOBALS['dbi']->freeResult($result);
return $this->template->render('privileges/choose_user_group', [
return $this->template->render('server/privileges/choose_user_group', [
'all_user_groups' => $allUserGroups,
'user_group' => $userGroup,
'params' => ['username' => $username]
@ -845,7 +845,7 @@ class Privileges
],
];
return $this->template->render('privileges/require_options', [
return $this->template->render('server/privileges/require_options', [
'require_options' => $require_options
]);
}
@ -897,7 +897,7 @@ class Privileges
]
];
$html_output = $this->template->render('privileges/resource_limits', [
$html_output = $this->template->render('server/privileges/resource_limits', [
'limits' => $limits
]);
@ -953,7 +953,7 @@ class Privileges
$privs
);
return $this->template->render('privileges/edit_routine_privileges', [
return $this->template->render('server/privileges/edit_routine_privileges', [
'username' => $username,
'hostname' => $hostname,
'database' => $db,
@ -1455,7 +1455,7 @@ class Privileges
array $privTableNames,
array $row
) {
return $this->template->render('privileges/global_priv_table', [
return $this->template->render('server/privileges/global_priv_table', [
'priv_table' => $privTable,
'priv_table_names' => $privTableNames,
'row' => $row,
@ -3581,7 +3581,7 @@ class Privileges
$data['routines'] = $routines;
}
return $this->template->render('privileges/privileges_summary', $data);
return $this->template->render('server/privileges/privileges_summary', $data);
}
/**
@ -3812,7 +3812,7 @@ class Privileges
{
$html_output = $this->getAddUserHtmlFieldset();
$html_output .= $this->template->render('privileges/delete_user_fieldset');
$html_output .= $this->template->render('server/privileges/delete_user_fieldset');
return $html_output;
}
@ -3851,7 +3851,7 @@ class Privileges
uksort($array_initials, "strnatcasecmp");
return $this->template->render('privileges/initials_row', [
return $this->template->render('server/privileges/initials_row', [
'array_initials' => $array_initials,
'initial' => isset($_REQUEST['initial']) ? $_REQUEST['initial'] : null,
]);
@ -4572,7 +4572,7 @@ class Privileges
= $table;
}
return $this->template->render('privileges/add_user_fieldset', [
return $this->template->render('server/privileges/add_user_fieldset', [
'url_params' => $url_params,
'rel_params' => $rel_params
]);

4
libraries/classes/Template.php
View File

@ -12,9 +12,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Twig\CharsetsExtension;
use PhpMyAdmin\Twig\CoreExtension;
use PhpMyAdmin\Twig\I18nExtension;
use PhpMyAdmin\Twig\IndexExtension;
use PhpMyAdmin\Twig\MessageExtension;
use PhpMyAdmin\Twig\PartitionExtension;
use PhpMyAdmin\Twig\PluginsExtension;
use PhpMyAdmin\Twig\RelationExtension;
use PhpMyAdmin\Twig\SanitizeExtension;
@ -70,9 +68,7 @@ class Template
$twig->addExtension(new CharsetsExtension());
$twig->addExtension(new CoreExtension());
$twig->addExtension(new I18nExtension());
$twig->addExtension(new IndexExtension());
$twig->addExtension(new MessageExtension());
$twig->addExtension(new PartitionExtension());
$twig->addExtension(new PluginsExtension());
$twig->addExtension(new RelationExtension());
$twig->addExtension(new SanitizeExtension());

6
libraries/classes/Twig/CharsetsExtension.php
View File

@ -28,16 +28,16 @@ class CharsetsExtension extends AbstractExtension
{
return [
new TwigFunction(
'Charsets_getCollationDescr',
'get_collation_descr',
'PhpMyAdmin\Charsets::getCollationDescr'
),
new TwigFunction(
'Charsets_getCharsetDropdownBox',
'get_charset_dropdown_box',
'PhpMyAdmin\Charsets::getCharsetDropdownBox',
['is_safe' => ['html']]
),
new TwigFunction(
'Charsets_getCollationDropdownBox',
'get_collation_dropdown_box',
'PhpMyAdmin\Charsets::getCollationDropdownBox',
['is_safe' => ['html']]
),

12
libraries/classes/Twig/CoreExtension.php
View File

@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class CoreExtension
@ -20,15 +20,15 @@ use Twig\TwigFunction;
class CoreExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Core_mimeDefaultFunction',
new TwigFilter(
'mime_default_function',
'PhpMyAdmin\Core::mimeDefaultFunction',
['is_safe' => ['html']]
),

37
libraries/classes/Twig/IndexExtension.php
View File

@ -1,37 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* hold PhpMyAdmin\Twig\IndexExtension class
*
* @package PhpMyAdmin\Twig
*/
declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
/**
* Class IndexExtension
*
* @package PhpMyAdmin\Twig
*/
class IndexExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
*
* @return TwigFunction[]
*/
public function getFunctions()
{
return [
new TwigFunction(
'Index_getHtmlForDisplayIndexes',
'PhpMyAdmin\Index::getHtmlForDisplayIndexes',
['is_safe' => ['html']]
),
];
}
}

16
libraries/classes/Twig/MessageExtension.php
View File

@ -11,7 +11,7 @@ namespace PhpMyAdmin\Twig;
use PhpMyAdmin\Message;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class MessageExtension
@ -21,22 +21,22 @@ use Twig\TwigFunction;
class MessageExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Message_notice',
new TwigFilter(
'notice',
function ($string) {
return Message::notice($string)->getDisplay();
},
['is_safe' => ['html']]
),
new TwigFunction(
'Message_error',
new TwigFilter(
'error',
function ($string) {
return Message::error($string)->getDisplay();
},

37
libraries/classes/Twig/PartitionExtension.php
View File

@ -1,37 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* hold PhpMyAdmin\Twig\PartitionExtension class
*
* @package PhpMyAdmin\Twig
*/
declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
/**
* Class PartitionExtension
*
* @package PhpMyAdmin\Twig
*/
class PartitionExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
*
* @return TwigFunction[]
*/
public function getFunctions()
{
return [
new TwigFunction(
'Partition_getPartitions',
'PhpMyAdmin\Partition::getPartitions',
['is_safe' => ['html']]
),
];
}
}

8
libraries/classes/Twig/PluginsExtension.php
View File

@ -28,22 +28,22 @@ class PluginsExtension extends AbstractExtension
{
return [
new TwigFunction(
'Plugins_checkboxCheck',
'checkbox_check',
'PhpMyAdmin\Plugins::checkboxCheck',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getChoice',
'get_choice',
'PhpMyAdmin\Plugins::getChoice',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getDefault',
'get_default_plugin',
'PhpMyAdmin\Plugins::getDefault',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getOptions',
'get_options',
'PhpMyAdmin\Plugins::getOptions',
['is_safe' => ['html']]
),

10
libraries/classes/Twig/RelationExtension.php
View File

@ -30,25 +30,25 @@ class RelationExtension extends AbstractExtension
$relation = new Relation();
return [
new TwigFunction(
'Relation_foreignDropdown',
'foreign_dropdown',
[$relation, 'foreignDropdown'],
['is_safe' => ['html']]
),
new TwigFunction(
'Relation_getDisplayField',
'get_display_field',
[$relation, 'getDisplayField'],
['is_safe' => ['html']]
),
new TwigFunction(
'Relation_getForeignData',
'get_foreign_data',
[$relation, 'getForeignData']
),
new TwigFunction(
'Relation_getTables',
'get_tables',
[$relation, 'getTables']
),
new TwigFunction(
'Relation_searchColumnInForeigners',
'search_column_in_foreigners',
[$relation, 'searchColumnInForeigners']
),
];

20
libraries/classes/Twig/SanitizeExtension.php
View File

@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class SanitizeExtension
@ -20,25 +20,25 @@ use Twig\TwigFunction;
class SanitizeExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Sanitize_escapeJsString',
new TwigFilter(
'escape_js_string',
'PhpMyAdmin\Sanitize::escapeJsString',
['is_safe' => ['html']]
),
new TwigFunction(
'Sanitize_jsFormat',
new TwigFilter(
'js_format',
'PhpMyAdmin\Sanitize::jsFormat',
['is_safe' => ['html']]
),
new TwigFunction(
'Sanitize_sanitize',
new TwigFilter(
'sanitize',
'PhpMyAdmin\Sanitize::sanitize',
['is_safe' => ['html']]
),

2
libraries/classes/Twig/ServerPrivilegesExtension.php
View File

@ -31,7 +31,7 @@ class ServerPrivilegesExtension extends AbstractExtension
$serverPrivileges = new Privileges(new Template());
return [
new TwigFunction(
'ServerPrivileges_formatPrivilege',
'format_privilege',
[$serverPrivileges, 'formatPrivilege'],
['is_safe' => ['html']]
),

2
libraries/classes/Twig/StorageEngineExtension.php
View File

@ -28,7 +28,7 @@ class StorageEngineExtension extends AbstractExtension
{
return [
new TwigFunction(
'StorageEngine_getHtmlSelect',
'get_html_select',
'PhpMyAdmin\StorageEngine::getHtmlSelect',
['is_safe' => ['html']]
),

2
libraries/classes/Twig/TableExtension.php
View File

@ -28,7 +28,7 @@ class TableExtension extends AbstractExtension
{
return [
new TwigFunction(
'Table_get',
'table_get',
'PhpMyAdmin\Table::get'
),
];

2
libraries/classes/Twig/TrackerExtension.php
View File

@ -28,7 +28,7 @@ class TrackerExtension extends AbstractExtension
{
return [
new TwigFunction(
'Tracker_getVersion',
'get_tracker_version',
'PhpMyAdmin\Tracker::getVersion'
),
];

4
libraries/classes/Twig/TransformationsExtension.php
View File

@ -30,11 +30,11 @@ class TransformationsExtension extends AbstractExtension
$transformations = new Transformations();
return [
new TwigFunction(
'Transformations_getDescription',
'get_description',
[$transformations, 'getDescription']
),
new TwigFunction(
'Transformations_getName',
'get_name',
[$transformations, 'getName']
),
];

24
libraries/classes/Twig/UrlExtension.php
View File

@ -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'
),
];

95
libraries/classes/Twig/UtilExtension.php
View File

@ -11,6 +11,7 @@ namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class UtilExtension
@ -28,164 +29,170 @@ class UtilExtension extends AbstractExtension
{
return [
new TwigFunction(
'Util_backquote',
'backquote',
'PhpMyAdmin\Util::backquote'
),
new TwigFunction(
'Util_getBrowseUploadFileBlock',
'get_browse_upload_file_block',
'PhpMyAdmin\Util::getBrowseUploadFileBlock',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_convertBitDefaultValue',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
new TwigFunction(
'Util_escapeMysqlWildcards',
'PhpMyAdmin\Util::escapeMysqlWildcards'
),
new TwigFunction(
'Util_extractColumnSpec',
'extract_column_spec',
'PhpMyAdmin\Util::extractColumnSpec'
),
new TwigFunction(
'Util_formatByteDown',
'format_byte_down',
'PhpMyAdmin\Util::formatByteDown'
),
new TwigFunction(
'Util_formatNumber',
'format_number',
'PhpMyAdmin\Util::formatNumber'
),
new TwigFunction(
'Util_formatSql',
'format_sql',
'PhpMyAdmin\Util::formatSql',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getButtonOrImage',
'get_button_or_image',
'PhpMyAdmin\Util::getButtonOrImage',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getClassForType',
'get_class_for_type',
'PhpMyAdmin\Util::getClassForType',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDivForSliderEffect',
'get_div_for_slider_effect',
'PhpMyAdmin\Util::getDivForSliderEffect',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDocuLink',
'get_docu_link',
'PhpMyAdmin\Util::getDocuLink',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getListNavigator',
'get_list_navigator',
'PhpMyAdmin\Util::getListNavigator',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showDocu',
'show_docu',
'PhpMyAdmin\Util::showDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDropdown',
'get_dropdown',
'PhpMyAdmin\Util::getDropdown',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getFKCheckbox',
'get_fk_checkbox',
'PhpMyAdmin\Util::getFKCheckbox',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getGISDatatypes',
'get_gis_datatypes',
'PhpMyAdmin\Util::getGISDatatypes'
),
new TwigFunction(
'Util_getGISFunctions',
'get_gis_functions',
'PhpMyAdmin\Util::getGISFunctions'
),
new TwigFunction(
'Util_getHtmlTab',
'get_html_tab',
'PhpMyAdmin\Util::getHtmlTab',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getIcon',
'get_icon',
'PhpMyAdmin\Util::getIcon',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getImage',
'get_image',
'PhpMyAdmin\Util::getImage',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getRadioFields',
'get_radio_fields',
'PhpMyAdmin\Util::getRadioFields',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getSelectUploadFileBlock',
'get_select_upload_file_block',
'PhpMyAdmin\Util::getSelectUploadFileBlock',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getScriptNameForOption',
'get_script_name_for_option',
'PhpMyAdmin\Util::getScriptNameForOption',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getStartAndNumberOfRowsPanel',
'get_start_and_number_of_rows_panel',
'PhpMyAdmin\Util::getStartAndNumberOfRowsPanel',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getSupportedDatatypes',
'get_supported_datatypes',
'PhpMyAdmin\Util::getSupportedDatatypes',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_isForeignKeySupported',
'is_foreign_key_supported',
'PhpMyAdmin\Util::isForeignKeySupported'
),
new TwigFunction(
'Util_linkOrButton',
'link_or_button',
'PhpMyAdmin\Util::linkOrButton',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_localisedDate',
'localised_date',
'PhpMyAdmin\Util::localisedDate'
),
new TwigFunction(
'Util_showHint',
'show_hint',
'PhpMyAdmin\Util::showHint',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showDocu',
'PhpMyAdmin\Util::showDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showIcons',
'show_icons',
'PhpMyAdmin\Util::showIcons'
),
new TwigFunction(
'Util_showMySQLDocu',
'show_mysql_docu',
'PhpMyAdmin\Util::showMySQLDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_sortableTableHeader',
'sortable_table_header',
'PhpMyAdmin\Util::sortableTableHeader',
['is_safe' => ['html']]
),
];
}
/**
* Returns a list of filters to add to the existing list.
*
* @return TwigFilter[]
*/
public function getFilters()
{
return [
new TwigFilter(
'convert_bit_default_value',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
new TwigFilter(
'escape_mysql_wildcards',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
];
}
}

19
po/az.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-07-27 08:19+0000\n"
"PO-Revision-Date: 2018-07-29 07:34+0000\n"
"Last-Translator: Yusif Məmmədov <yusifmv@gmail.com>\n"
"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
"master/az/>\n"
@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.1-dev\n"
"X-Generator: Weblate 3.1.1\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
msgstr "Pis tip!"
msgstr "Qeyri-münasib dəyişən"
#: changelog.php:41 license.php:36
#, php-format
@ -25,7 +25,7 @@ msgid ""
"The %s file is not available on this system, please visit %s for more "
"information."
msgstr ""
"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı %s saytından tapa "
"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı %s ünvanından tapa "
"bilərsiniz."
#: db_central_columns.php:130
@ -39,11 +39,11 @@ msgstr "Sıralamaq üçün klikləyin."
#: db_central_columns.php:178
#, php-format
msgid "Showing rows %1$s - %2$s."
msgstr "%1$s - %2$s sətir göstərilir."
msgstr "%1$s - %2$s sətirləri göstərilir."
#: db_datadict.php:64 libraries/classes/Operations.php:62
msgid "Database comment"
msgstr "Verilənlər bazasına şərh"
msgstr "Verilənlər bazası şərhi"
#: db_datadict.php:111
#: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:605
@ -147,7 +147,7 @@ msgstr "Null"
#: templates/database/central_columns/table_header.twig:21
#: templates/table/structure/table_structure_header.twig:10
msgid "Default"
msgstr "Susmaya görə"
msgstr "İlkin vəziyyət"
#: db_datadict.php:125 libraries/classes/Plugins/Export/ExportHtmlword.php:402
#: libraries/classes/Plugins/Export/ExportLatex.php:533
@ -333,7 +333,7 @@ msgstr ""
#: db_qbe.php:134
msgid "You have to choose at least one column to display!"
msgstr "Göstərilməsi üçün ən az bir sütun seçməlisiniz!"
msgstr "Göstərmək üçün ən az bir sütun seçməlisiniz!"
#: db_qbe.php:152
#, php-format
@ -794,6 +794,9 @@ msgid ""
"Login cookie store is lower than cookie validity configured in phpMyAdmin, "
"because of this, your login will expire sooner than configured in phpMyAdmin."
msgstr ""
"Giriş çərəz anbarı phpMyAdmində quraşdırılmış çərəz etibarlılıq müddətindən "
"azdır, buna görə də, sizin girişiniz phpMyAdmində quraşdırılmış müddətdən "
"tez bağlanacaq."
#: index.php:554
msgid "The configuration file now needs a secret passphrase (blowfish_secret)."

1979
po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

2
templates/columns_definitions/column_attributes.twig
View File

@ -54,7 +54,7 @@
</td>
<td class="center">
{# column collation #}
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'field_collation[' ~ column_number ~ ']',

12
templates/columns_definitions/column_definitions_form.twig
View File

@ -1,7 +1,7 @@
<form method="post" action="{{ action }}" class="
{{- action == 'tbl_create.php' ? 'create_table' : 'append_fields' -}}
_form ajax lock-page">
{{ 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 #}
@ -75,12 +75,12 @@
<td width="25">&nbsp;</td>
<th>
{% trans 'Storage Engine:' %}
{{ Util_showMySQLDocu('Storage_engines') }}
{{ show_mysql_docu('Storage_engines') }}
</th>
<td width="25">&nbsp;</td>
<th>
{% trans 'Connection:' %}
{{ Util_showMySQLDocu('federated-create-connection') }}
{{ show_mysql_docu('federated-create-connection') }}
</th>
</tr>
<tr>
@ -94,7 +94,7 @@
</td>
<td width="25">&nbsp;</td>
<td>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'tbl_collation',
@ -105,7 +105,7 @@
</td>
<td width="25">&nbsp;</td>
<td>
{{ StorageEngine_getHtmlSelect(
{{ get_html_select(
'tbl_storage_engine',
null,
tbl_storage_engine
@ -126,7 +126,7 @@
<tr class="vtop">
<th colspan="5">
{% trans 'PARTITION definition:' %}
{{ Util_showMySQLDocu('Partitioning') }}
{{ show_mysql_docu('Partitioning') }}
</th>
</tr>
<tr>

2
templates/columns_definitions/column_type.twig
View File

@ -4,5 +4,5 @@
{%- if column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] -%}
disabled="disabled"
{%- endif %}>
{{ Util_getSupportedDatatypes(true, type_upper) }}
{{ get_supported_datatypes(true, type_upper) }}
</select>

2
templates/columns_definitions/move_column.twig
View File

@ -9,7 +9,7 @@
{% for mi in 0..move_columns|length - 1 %}
<option value="{{ move_columns[mi].name }}"
{{- current_index == mi or current_index == mi + 1 ? ' disabled="disabled"' }}>
{{ 'after %s'|trans|format(Util_backquote(move_columns[mi].name|e)) }}
{{ 'after %s'|trans|format(backquote(move_columns[mi].name|e)) }}
</option>
{% endfor %}
</select>

2
templates/columns_definitions/partitions.twig
View File

@ -134,7 +134,7 @@
</td>
{% endif %}
<td>
{{ StorageEngine_getHtmlSelect(
{{ get_html_select(
subpartition['prefix'] ~ '[engine]',
null,
subpartition['engine'],

18
templates/columns_definitions/table_fields_definitions.twig
View File

@ -2,7 +2,7 @@
<table id="table_columns" class="noclick">
<caption class="tblHeaders">
{% trans 'Structure' %}
{{ Util_showMySQLDocu('CREATE_TABLE') }}
{{ show_mysql_docu('CREATE_TABLE') }}
</caption>
<tr>
<th>
@ -10,15 +10,15 @@
</th>
<th>
{% trans 'Type' %}
{{ Util_showMySQLDocu('data-types') }}
{{ show_mysql_docu('data-types') }}
</th>
<th>
{% trans 'Length/Values' %}
{{ Util_showHint('If column type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'…<br />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) }}
{{ show_hint('If column type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'…<br />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) }}
</th>
<th>
{% trans 'Default' %}
{{ Util_showHint('For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'|trans) }}
{{ show_hint('For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'|trans) }}
</th>
<th>
{% trans 'Collation' %}
@ -34,7 +34,7 @@
{% if change_column is defined and change_column is not empty %}
<th>
{% trans 'Adjust privileges' %}
{{ Util_showDocu('faq', 'faq6-39') }}
{{ show_docu('faq', 'faq6-39') }}
</th>
{% endif %}
@ -72,7 +72,7 @@
</th>
<th>
<a href="transformation_overview.php
{{- Url_getCommon() }}#transformation" title="
{{- get_common() }}#transformation" title="
{%- trans 'List of available transformations and their options' -%}
" target="_blank">
{% trans 'Browser display transformation' %}
@ -80,10 +80,10 @@
</th>
<th>
{% trans 'Browser display transformation options' %}
{{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />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) }}
{{ show_hint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />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) }}
</th>
<th>
<a href="transformation_overview.php{{ Url_getCommon() }}#input_transformation"
<a href="transformation_overview.php{{ get_common() }}#input_transformation"
title="{% trans 'List of available transformations and their options' %}"
target="_blank">
{% trans 'Input transformation' %}
@ -91,7 +91,7 @@
</th>
<th>
{% trans 'Input transformation options' %}
{{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />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) }}
{{ show_hint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />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) }}
</th>
{% endif %}
</tr>

4
templates/columns_definitions/transformation.twig
View File

@ -9,11 +9,11 @@
and mime_map[column_meta['Field']][type] matches
'@' ~ available_mime[type ~ '_file_quoted'][mimekey] ~ '3?@i'
? 'selected ' %}
{% set tooltip = Transformations_getDescription(
{% set tooltip = get_description(
available_mime[type ~ '_file'][mimekey]
) %}
{% set parts = transform|split(':') %}
{% set name = Transformations_getName(
{% set name = get_name(
available_mime[type ~ '_file'][mimekey]
) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' %}
<option value="{{ available_mime[type ~ '_file'][mimekey] }}"

2
templates/create_tracking_version.twig
View File

@ -1,6 +1,6 @@
<div id="div_create_version">
<form method="post" action="{{ url_query|raw }}">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
{% for selected_table in selected %}
<input type="hidden" name="selected[]" value="{{ selected_table }}">
{% endfor %}

28
templates/database/central_columns/main.twig
View File

@ -5,7 +5,7 @@
</a>
<form id="add_new" class="new_central_col{{ (total_rows != 0) ? ' hide' : ''}}"
method="post" action="db_central_columns.php">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="add_new_column" value="add_new_column">
<div class="responsivetable">
<table>
@ -91,7 +91,7 @@
} only %}
</td>
<td name="collation" class="nowrap">
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[0]',
@ -147,7 +147,7 @@
{% if pos - max_rows >= 0 %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="pos" value="{{ pos - max_rows }}" />
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
<input type="submit" name="navig" class="ajax" value="&lt" />
@ -157,7 +157,7 @@
{% if tn_nbTotalPage > 1 %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
{{ tn_page_selector | raw }}
</form>
@ -166,7 +166,7 @@
{% if pos + max_rows < total_rows %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="pos" value="{{ pos + max_rows }}"/>
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
<input type="submit" name="navig" class="ajax" value="&gt" />
@ -189,9 +189,9 @@
<tr>
<td class="navigation_separator largescreenonly"></td>
<td class="central_columns_navigation">
{{ Util_getIcon('centralColumns_add', 'Add column' | trans)|raw }}
{{ get_icon('centralColumns_add', 'Add column' | trans)|raw }}
<form id="add_column" action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) | raw }}
{{ get_hidden_inputs(db) | raw }}
<input type="hidden" name="add_column" value="add">
<input type="hidden" name="pos" value="{{ pos }}" />
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
@ -215,7 +215,7 @@
</table>
{% if total_rows > 0 %}
<form method="post" id="del_form" action="db_central_columns.php">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input id="del_col_name" type="hidden" name="col_name" value="">
<input type="hidden" name="pos" value="{{ pos }}">
<input type="hidden" name="delete_save" value="delete">
@ -269,17 +269,17 @@
{% for row in rows_list %}
{# getHtmlForTableRow #}
<tr data-rownum="{{ row_num }}" id="{{ 'f_' ~ row_num }}">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="edit_save" value="save">
<td class="nowrap">
<input type="checkbox" class="checkall" name="selected_fld[]"
value="{{ row['col_name'] | raw }}" id="{{ 'checkbox_row_' ~ row_num }}"/>
</td>
<td id="{{ 'edit_' ~ row_num }}" class="edit center">
<a href="#"> {{ Util_getIcon('b_edit', 'Edit' | trans) | raw }}</a>
<a href="#"> {{ get_icon('b_edit', 'Edit' | trans) | raw }}</a>
</td>
<td class="del_row" data-rownum = "{{ row_num }}">
<a hrf="#">{{ Util_getIcon('b_drop', 'Delete' | trans) }}</a>
<a hrf="#">{{ get_icon('b_drop', 'Delete' | trans) }}</a>
<input type="submit" data-rownum = "{{ row_num }}" class="edit_cancel_form" value="Cancel">
</td>
<td id="{{ 'save_' ~ row_num }}" class="hide">
@ -338,7 +338,7 @@
</td>
<td name="collation" class="nowrap">
<span>{{ row['col_collation'] | raw }}</span>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[' ~ row_num ~ ']',
@ -391,14 +391,14 @@
'text_dir' : text_dir,
'form_name' : 'tableslistcontainer',
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'edit_central_columns',
'mult_submit change_central_columns',
'Edit' | trans,
'b_edit',
'edit central columns'
) | raw }}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'delete_central_columns',
'mult_submit',
'Delete' | trans,

6
templates/database/create_table.twig
View File

@ -1,12 +1,12 @@
<form id="create_table_form_minimal" method="post" action="tbl_create.php" class="lock-page">
<fieldset>
<legend>
{% if Util_showIcons('ActionLinksMode') -%}
{{ Util_getImage('b_table_add') }}
{% if show_icons('ActionLinksMode') -%}
{{ get_image('b_table_add') }}
{%- endif %}
{% trans "Create table" %}
</legend>
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<div class="formelement">
{% trans "Name" %}:
<input type="text" name="table" maxlength="64" size="30" required="required" />

4
templates/database/designer/database_tables.twig
View File

@ -57,14 +57,14 @@
</thead>
<tbody id="id_tbody_{{ t_n_url|url_encode }}"
{{- tab_pos[t_n] is defined and tab_pos[t_n]['V'] is empty ? ' style="display: none"' }}>
{% set display_field = Relation_getDisplayField(get_db, table_names_small[i]) %}
{% set display_field = get_display_field(get_db, table_names_small[i]) %}
{% for j in 0..tab_column[t_n]['COLUMN_ID']|length - 1 %}
{% set tmp_column = t_n ~ '.' ~ tab_column[t_n]['COLUMN_NAME'][j] %}
{% set click_field_param = [
table_names_small_url[i],
tab_column[t_n]['COLUMN_NAME'][j]|url_encode
] %}
{% if not Util_isForeignKeySupported(table_types[i]) %}
{% if not is_foreign_key_supported(table_types[i]) %}
{% set click_field_param = click_field_param|merge([tables_pk_or_unique_keys[tmp_column] is defined ? 1 : 0]) %}
{% else %}
{# if foreign keys are supported, it's not necessary that the

2
templates/database/designer/edit_delete_pages.twig
View File

@ -1,5 +1,5 @@
<form action="db_designer.php" method="post" name="edit_delete_pages" id="edit_delete_pages" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset id="page_edit_delete_options">
<input type="hidden" name="operation" value="{{ operation }}" />
<label for="selected_page">

4
templates/database/designer/main.twig
View File

@ -110,7 +110,7 @@ var designer_config = {{ designer_config | raw }};
{% trans 'Reload' %}
</span>
</a>
<a href="{{ Util_getDocuLink('faq', 'faq6-31') }}"
<a href="{{ get_docu_link('faq', 'faq6-31') }}"
target="documentation"
class="M_butt">
<img title="{% trans 'Help' %}"
@ -1130,7 +1130,7 @@ var designer_config = {{ designer_config | raw }};
<form method="post" action="db_qbe.php" id="vqb_form">
<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea>
<input type="hidden" name="submit_sql" value="true">
{{ Url_getHiddenInputs(get_db) }}
{{ get_hidden_inputs(get_db) }}
</form>
</div>
{% endif %}

4
templates/database/designer/page_save_as.twig
View File

@ -1,5 +1,5 @@
<form action="db_designer.php" method="post" name="save_as_pages" id="save_as_pages" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset id="page_save_as_options">
<table>
<tbody>
@ -14,7 +14,7 @@
</tr>
<tr>
<td>
{{ Util_getRadioFields(
{{ get_radio_fields(
'save_page',
{
'same': 'Save to selected page'|trans,

6
templates/database/designer/schema_export.twig
View File

@ -1,9 +1,9 @@
<form method="post" action="schema_export.php" class="disableAjax" id="id_export_pages">
<fieldset>
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<label>{% trans 'Select Export Relational Type' %}</label>
{{ Plugins_getChoice('Schema', 'export_type', export_list, 'format') }}
{{ get_choice('Schema', 'export_type', export_list, 'format') }}
<input type="hidden" name="page_number" value="{{ page }}" />
{{ Plugins_getOptions('Schema', export_list) }}
{{ get_options('Schema', export_list) }}
</fieldset>
</form>

2
templates/database/multi_table_query/form.twig
View File

@ -1,4 +1,4 @@
{{ Util_getDivForSliderEffect('query_div', 'Query window'|trans, 'open') }}
{{ get_div_for_slider_effect('query_div', 'Query window'|trans, 'open') }}
<form action="" id="query_form">
<input type="hidden" id="db_name" value="{{ db }}">
<fieldset>

4
templates/database/search/main.twig
View File

@ -1,6 +1,6 @@
<a id="db_search"></a>
<form id="db_search_form" method="post" action="db_search.php" name="db_search" class="ajax lock-page">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset>
<legend>{% trans 'Search in database' %}</legend>
<p>
@ -16,7 +16,7 @@
{# 4th parameter set to true to add line breaks #}
{# 5th parameter set to false to avoid htmlspecialchars() escaping
in the label since we have some HTML in some labels #}
{{ Util_getRadioFields(
{{ get_radio_fields(
'criteriaSearchType',
choices,
criteria_search_type,

4
templates/database/search/results.twig
View File

@ -28,7 +28,7 @@
<td>
<a name="browse_search"
class="ajax browse_results"
href="sql.php{{ Url_getCommon(url_params) }}"
href="sql.php{{ get_common(url_params) }}"
data-browse-sql="{{ row.new_search_sqls.select_columns }}"
data-table-name="{{ row.table }}">
{% trans 'Browse' %}
@ -37,7 +37,7 @@
<td>
<a name="delete_search"
class="ajax delete_results"
href="sql.php{{ Url_getCommon(url_params) }}"
href="sql.php{{ get_common(url_params) }}"
data-delete-sql="{{ row.new_search_sqls.delete }}"
data-table-name="{{ row.table }}">
{% trans 'Delete' %}

12
templates/database/structure/body_for_table_summary.twig
View File

@ -5,7 +5,7 @@
{% set num_tables_trans -%}
{% trans %}%s table{% plural num_tables %}%s tables{% endtrans %}
{%- endset %}
{{ num_tables_trans|format(Util_formatNumber(num_tables, 0)) }}
{{ num_tables_trans|format(format_number(num_tables, 0)) }}
</th>
{% if server_slave_status %}
<th>{% trans 'Replication' %}</th>
@ -15,7 +15,7 @@
{% set sum_colspan = sum_colspan - 1 %}
{% endif %}
<th colspan="{{ sum_colspan }}" class="print_ignore">{% trans 'Sum' %}</th>
{% set row_count_sum = Util_formatNumber(sum_entries, 0) %}
{% set row_count_sum = format_number(sum_entries, 0) %}
{# If a table shows approximate rows count, display update-all-real-count anchor. #}
{% set row_sum_url = [] %}
{% if approx_rows is defined %}
@ -29,7 +29,7 @@
{% if approx_rows %}
{% set cell_text -%}
<a href="db_structure.php
{{- Url_getCommon(row_sum_url) }}" class="ajax row_count_sum">~
{{- get_common(row_sum_url) }}" class="ajax row_count_sum">~
{{- row_count_sum -}}
</a>
{%- endset %}
@ -51,7 +51,7 @@
</th>
<th>
{% if db_collation is not empty %}
<dfn title="{{ Charsets_getCollationDescr(db_collation) }} ({% trans 'Default' %})">
<dfn title="{{ get_collation_descr(db_collation) }} ({% trans 'Default' %})">
{{ db_collation }}
</dfn>
{% endif %}
@ -59,12 +59,12 @@
{% endif %}
{% if is_show_stats %}
{% set sum = Util_formatByteDown(sum_size, 3, 1) %}
{% set sum = format_byte_down(sum_size, 3, 1) %}
{% set sum_formatted = sum[0] %}
{% set sum_unit = sum[1] %}
<th class="value tbl_size">{{ sum_formatted }} {{ sum_unit }}</th>
{% set overhead = Util_formatByteDown(overhead_size, 3, 1) %}
{% set overhead = format_byte_down(overhead_size, 3, 1) %}
{% set overhead_formatted = overhead[0] %}
{% set overhead_unit = overhead[1] %}
<th class="value tbl_overhead">{{ overhead_formatted }} {{ overhead_unit }}</th>

2
templates/database/structure/favorite_anchor.twig
View File

@ -1,6 +1,6 @@
<a id="{{ table_name_hash }}_favorite_anchor"
class="ajax favorite_table_anchor"
href="db_structure.php{{ Url_getCommon(fav_params) }}"
href="db_structure.php{{ get_common(fav_params) }}"
title="{{ already_favorite ? 'Remove from Favorites'|trans : 'Add to Favorites'|trans }}"
data-favtargets="{{ db_table_name_hash }}" >
{{ already_favorite ? titles['Favorite']|raw : titles['NoFavorite']|raw }}

4
templates/database/structure/print_view_data_dictionary_link.twig
View File

@ -1,8 +1,8 @@
<p class="print_ignore">
<a href="#" id="printView">
{{ Util_getIcon('b_print', 'Print'|trans, true) }}
{{ get_icon('b_print', 'Print'|trans, true) }}
</a>
<a href="db_datadict.php{{ url_query }}" target="print_view">
{{ Util_getIcon('b_tblanalyse', 'Data dictionary'|trans, true) }}
{{ get_icon('b_tblanalyse', 'Data dictionary'|trans, true) }}
</a>
</p>

4
templates/database/structure/show_create_row.twig
View File

@ -10,8 +10,8 @@
<tbody>
{% for object in db_objects %}
<tr>
<td><strong>{{ Core_mimeDefaultFunction(object) }}</strong></td>
<td>{{ Core_mimeDefaultFunction(dbi.getTable(db, object).showCreate()) }}</td>
<td><strong>{{ object|mime_default_function }}</strong></td>
<td>{{ dbi.getTable(db, object).showCreate()|mime_default_function }}</td>
</tr>
{% endfor %}
</tbody>

8
templates/database/structure/structure_table_row.twig
View File

@ -14,8 +14,8 @@
</th>
{% if server_slave_status %}
<td class="center">
{{ ignored ? Util_getImage('s_cancel', 'Not replicated'|trans) }}
{{ do ? Util_getImage('s_success', 'Replicated'|trans) }}
{{ ignored ? get_image('s_cancel', 'Not replicated'|trans) }}
{{ do ? get_image('s_success', 'Replicated'|trans) }}
</td>
{% endif %}
@ -81,14 +81,14 @@
{% if current_table['TABLE_ROWS'] is defined
and (current_table['ENGINE'] != null or table_is_view) %}
{# Get the row count #}
{% set row_count = Util_formatNumber(current_table['TABLE_ROWS'], 0) %}
{% set row_count = format_number(current_table['TABLE_ROWS'], 0) %}
{# Content to be appended into 'tbl_rows' cell.
If row count is approximate, display it as an anchor to get real count. #}
<td class="value tbl_rows"
data-table="{{ current_table['TABLE_NAME'] }}">
{% if approx_rows %}
<a href="db_structure.php{{ Url_getCommon({
<a href="db_structure.php{{ get_common({
'ajax_request': true,
'db': db,
'table': current_table['TABLE_NAME'],

28
templates/database/structure/table_header.twig
View File

@ -1,11 +1,11 @@
<form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<div class="responsivetable">
<table id="structureTable" class="data">
<thead>
<tr>
<th class="print_ignore"></th>
<th>{{ Util_sortableTableHeader('Table'|trans, 'table') }}</th>
<th>{{ sortable_table_header('Table'|trans, 'table') }}</th>
{% if replication %}
<th>{% trans 'Replication' %}</th>
{% endif %}
@ -23,44 +23,42 @@
</th>
{# larger values are more interesting so default sort order is DESC #}
<th>
{{ Util_sortableTableHeader('Rows'|trans, 'records', 'DESC') }}
{{ Util_showHint(Sanitize_sanitize(
'May be approximate. Click on the number to get the exact count. See [doc@faq3-11]FAQ 3.11[/doc].'|trans
)) }}
{{ sortable_table_header('Rows'|trans, 'records', 'DESC') }}
{{ show_hint('May be approximate. Click on the number to get the exact count. See [doc@faq3-11]FAQ 3.11[/doc].'|trans|sanitize) }}
</th>
{% if not (properties_num_columns > 1) %}
<th>{{ Util_sortableTableHeader('Type'|trans, 'type') }}</th>
<th>{{ Util_sortableTableHeader('Collation'|trans, 'collation') }}</th>
<th>{{ sortable_table_header('Type'|trans, 'type') }}</th>
<th>{{ sortable_table_header('Collation'|trans, 'collation') }}</th>
{% endif %}
{% if is_show_stats %}
{# larger values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Size'|trans, 'size', 'DESC') }}</th>
<th>{{ sortable_table_header('Size'|trans, 'size', 'DESC') }}</th>
{# larger values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Overhead'|trans, 'overhead', 'DESC') }}</th>
<th>{{ sortable_table_header('Overhead'|trans, 'overhead', 'DESC') }}</th>
{% endif %}
{% if show_charset %}
<th>{{ Util_sortableTableHeader('Charset'|trans, 'charset') }}</th>
<th>{{ sortable_table_header('Charset'|trans, 'charset') }}</th>
{% endif %}
{% if show_comment %}
<th>{{ Util_sortableTableHeader('Comment'|trans, 'comment') }}</th>
<th>{{ sortable_table_header('Comment'|trans, 'comment') }}</th>
{% endif %}
{% if show_creation %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Creation'|trans, 'creation', 'DESC') }}</th>
<th>{{ sortable_table_header('Creation'|trans, 'creation', 'DESC') }}</th>
{% endif %}
{% if show_last_update %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Last update'|trans, 'last_update', 'DESC') }}</th>
<th>{{ sortable_table_header('Last update'|trans, 'last_update', 'DESC') }}</th>
{% endif %}
{% if show_last_check %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Last check'|trans, 'last_check', 'DESC') }}</th>
<th>{{ sortable_table_header('Last check'|trans, 'last_check', 'DESC') }}</th>
{% endif %}
</tr>
</thead>

6
templates/database/structure/tracking_icon.twig
View File

@ -1,7 +1,7 @@
<a href="tbl_tracking.php{{ Url_getCommon({'table': table, 'db': db}) }}">
<a href="tbl_tracking.php{{ get_common({'table': table, 'db': db}) }}">
{% if is_tracked -%}
{{ Util_getImage('eye', 'Tracking is active.'|trans) }}
{{ get_image('eye', 'Tracking is active.'|trans) }}
{%- else -%}
{{ Util_getImage('eye_grey', 'Tracking is not active.'|trans) }}
{{ get_image('eye_grey', 'Tracking is not active.'|trans) }}
{%- endif %}
</a>

20
templates/database/tracking/tables.twig
View File

@ -5,7 +5,7 @@
<form method="post" action="db_tracking.php" name="trackedForm"
id="trackedForm" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<table id="versions" class="data">
<thead>
<tr>
@ -48,23 +48,23 @@
<a class="delete_tracking_anchor ajax"
href="db_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;delete_tracking=true">
{{ Util_getIcon('b_drop', 'Delete tracking'|trans) }}
{{ get_icon('b_drop', 'Delete tracking'|trans) }}
</a>
</td>
<td>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}">
{{ Util_getIcon('b_versions', 'Versions'|trans) }}
{{ get_icon('b_versions', 'Versions'|trans) }}
</a>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;report=true&amp;version=
{{- version.version }}">
{{ Util_getIcon('b_report', 'Tracking report'|trans) }}
{{ get_icon('b_report', 'Tracking report'|trans) }}
</a>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;snapshot=true&amp;version=
{{- version.version }}">
{{ Util_getIcon('b_props', 'Structure snapshot'|trans) }}
{{ get_icon('b_props', 'Structure snapshot'|trans) }}
</a>
</td>
</tr>
@ -76,7 +76,7 @@
'text_dir': text_dir,
'form_name': 'trackedForm'
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Delete tracking'|trans,
@ -90,7 +90,7 @@
<h3>{% trans 'Untracked tables' %}</h3>
<form method="post" action="db_tracking.php" name="untrackedForm"
id="untrackedForm" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<table id="noversions" class="data">
<thead>
<tr>
@ -100,7 +100,7 @@
</tr>
</thead>
<tbody>
{% for table_name in untracked_tables if Tracker_getVersion(db, table_name) == -1 %}
{% for table_name in untracked_tables if get_tracker_version(db, table_name) == -1 %}
<tr>
<td class="center">
<input type="checkbox" name="selected_tbl[]"
@ -114,7 +114,7 @@
</th>
<td>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table={{ table_name }}">
{{ Util_getIcon('eye', 'Track table'|trans) }}
{{ get_icon('eye', 'Track table'|trans) }}
</a>
</td>
</tr>
@ -126,7 +126,7 @@
'text_dir': text_dir,
'form_name': 'untrackedForm'
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Track table'|trans,

6
templates/display/export/hidden_inputs.twig
View File

@ -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 #}

2
templates/display/export/option_header.twig
View File

@ -1,6 +1,6 @@
<div class="exportoptions" id="header">
<h2>
{{ Util_getImage('b_export', 'Export'|trans) }}
{{ get_image('b_export', 'Export'|trans) }}
{% if export_type == 'server' %}
{% trans 'Exporting databases from the current server' %}
{% elseif export_type == 'database' %}

2
templates/display/export/options_output_format.twig
View File

@ -1,7 +1,7 @@
<li>
<label for="filename_template" class="desc">
{% trans 'File name template:' %}
{{ Util_showHint(message) }}
{{ show_hint(message) }}
</label>
<input type="text" name="filename_template" id="filename_template" value="
{{- filename_template }}">

32
templates/display/import/import.twig
View File

@ -25,17 +25,17 @@
<input type="hidden" name="{{ id_key }}" value="{{ upload_id }}" />
{% 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 %}
<input type="hidden" name="import_type" value="{{ import_type }}" />
<div class="exportoptions" id="header">
<h2>
{{ Util_getImage('b_import', 'Import'|trans) }}
{{ get_image('b_import', 'Import'|trans) }}
{% if import_type == 'server' %}
{% trans 'Importing into the current server' %}
{% elseif import_type == 'database' %}
@ -65,7 +65,7 @@
<ul>
<li>
<input type="radio" name="file_location" id="radio_import_file" required="required" />
{{ Util_getBrowseUploadFileBlock(max_upload_size) }}
{{ get_browse_upload_file_block(max_upload_size) }}
{% trans 'You may also drag and drop a file on any page.' %}
</li>
<li>
@ -73,19 +73,19 @@
{%- if timeout_passed_global is not empty and local_import_file is not empty %}
checked="checked"
{%- endif %} />
{{ Util_getSelectUploadFileBlock(
{{ get_select_upload_file_block(
import_list,
upload_dir
) }}
</li>
</ul>
{% elseif is_upload %}
{{ Util_getBrowseUploadFileBlock(max_upload_size) }}
{{ get_browse_upload_file_block(max_upload_size) }}
<p>{% trans 'You may also drag and drop a file on any page.' %}</p>
{% elseif not is_upload %}
{{ Message_notice('File uploads are not allowed on this server.'|trans) }}
{{ 'File uploads are not allowed on this server.'|trans|notice }}
{% elseif upload_dir is not empty %}
{{ Util_getSelectUploadFileBlock(
{{ get_select_upload_file_block(
import_list,
upload_dir
) }}
@ -108,7 +108,7 @@
{% endfor %}
</select>
{% else %}
{{ Charsets_getCharsetDropdownBox(
{{ get_charset_dropdown_box(
dbi,
disable_is,
'charset_of_file',
@ -132,7 +132,7 @@
<div class="formelementrow">
<input type="checkbox" name="allow_interrupt" value="yes" id="checkbox_allow_interrupt"
{{ Plugins_checkboxCheck('Import', 'allow_interrupt') }} />
{{ checkbox_check('Import', 'allow_interrupt') }} />
<label for="checkbox_allow_interrupt">
{% trans 'Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. <em>(This might be a good way to import large files, however it can break transactions.)</em>' %}
</label>
@ -144,7 +144,7 @@
{% trans 'Skip this number of queries (for SQL) starting from the first one:' %}
</label>
<input type="number" name="skip_queries" value="
{{- Plugins_getDefault('Import', 'skip_queries') -}}
{{- get_default_plugin('Import', 'skip_queries') -}}
" id="text_skip_queries" min="0" />
</div>
{% else %}
@ -152,7 +152,7 @@
do not show the Skip dialog to avoid the risk of someone
entering a value here that would interfere with "skip" #}
<input type="hidden" name="skip_queries" value="
{{- Plugins_getDefault('Import', 'skip_queries') -}}
{{- get_default_plugin('Import', 'skip_queries') -}}
" id="text_skip_queries" />
{% endif %}
</div>
@ -160,13 +160,13 @@
<div class="importoptions">
<h3>{% trans 'Other options:' %}</h3>
<div class="formelementrow">
{{ Util_getFKCheckbox() }}
{{ get_fk_checkbox() }}
</div>
</div>
<div class="importoptions">
<h3>{% trans 'Format:' %}</h3>
{{ Plugins_getChoice('Import', 'format', import_list) }}
{{ get_choice('Import', 'format', import_list) }}
<div id="import_notification"></div>
</div>
@ -175,7 +175,7 @@
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
</p>
{{ Plugins_getOptions('Import', import_list) }}
{{ get_options('Import', import_list) }}
</div>
<div class="clearfloat"></div>

31
templates/display/import/javascript.twig
View File

@ -6,22 +6,16 @@ $( 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(
'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans,
false
) %}
{% set statustext_str = Sanitize_escapeJsString('%s of %s'|trans) %}
{% set second_str = Sanitize_jsFormat('%s/sec.'|trans, false) %}
{% set remaining_min = Sanitize_jsFormat('About %MIN min. %SEC sec. remaining.'|trans, false) %}
{% set remaining_second = Sanitize_jsFormat('About %SEC sec. remaining.'|trans, false) %}
{% set processed_str = Sanitize_jsFormat(
'The file is being processed, please be patient.'|trans,
false
) %}
{% set import_url = Url_getCommonRaw({'import_status': 1}) %}
{% set promot_str = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans|js_format(false) %}
{% set statustext_str = '%s of %s'|trans|escape_js_string %}
{% set second_str = '%s/sec.'|trans|js_format(false) %}
{% set remaining_min = 'About %MIN min. %SEC sec. remaining.'|trans|js_format(false) %}
{% set remaining_second = 'About %SEC sec. remaining.'|trans|js_format(false) %}
{% set processed_str = 'The file is being processed, please be patient.'|trans|js_format(false) %}
{% set import_url = get_common_raw({'import_status': 1}) %}
{% set upload_html %}
{% spaceless %}
@ -33,7 +27,7 @@ $( function() {
</div>
</div>
<div>
<img src="{{ pma_theme_image }}ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> {{ Sanitize_jsFormat('Uploading your import file…'|trans, false) -}}
<img src="{{ pma_theme_image }}ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> {{ 'Uploading your import file…'|trans|js_format(false) -}}
</div>
<div id="statustext"></div>
</div>
@ -158,11 +152,8 @@ $( function() {
{% set image_tag -%}
<img src="{{ pma_theme_image -}}
ajax_clock_small.gif" width="16" height="16" alt="ajax clock" />
{{- Sanitize_jsFormat(
'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans,
false
) -}}
{{- Util_showDocu('faq', 'faq2-9') -}}
{{- 'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans|js_format(false) -}}
{{- show_docu('faq', 'faq2-9') -}}
{%- endset %}
$('#upload_form_status_info').html('{{ image_tag|raw }}');
$("#upload_form_status").css("display", "none");

2
templates/display/results/additional_fields.twig
View File

@ -4,7 +4,7 @@
<input type="hidden" name="pos" size="3" value="{{ pos }}" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />
{% trans 'Number of rows:' %}
{{ Util_getDropdown(
{{ get_dropdown(
'session_max_rows',
number_of_rows_choices,
max_rows,

2
templates/display/results/multi_row_operations_form.twig
View File

@ -4,7 +4,7 @@
name="resultsForm"
id="resultsForm_{{ unique_id }}"
class="ajax">
{{ Url_getHiddenInputs(db, table, 1) }}
{{ get_hidden_inputs(db, table, 1) }}
<input type="hidden" name="goto" value="sql.php" />
{% endif %}

12
templates/display/results/options_block.twig
View File

@ -1,5 +1,5 @@
<form method="post" action="sql.php" name="displayOptionsForm" class="ajax print_ignore">
{{ Url_getHiddenInputs({
{{ get_hidden_inputs({
'db': db,
'table': table,
'sql_query': sql_query,
@ -7,11 +7,11 @@
'display_options_form': 1
}) }}
{{ Util_getDivForSliderEffect('', 'Options'|trans) }}
{{ get_div_for_slider_effect('', 'Options'|trans) }}
<fieldset>
<div class="formelement">
{# pftext means "partial or full texts" (done to reduce line lengths #}
{{ Util_getRadioFields(
{{ get_radio_fields(
'pftext',
{
'P': 'Partial texts'|trans,
@ -27,7 +27,7 @@
{% if relwork and displaywork %}
<div class="formelement">
{{ Util_getRadioFields(
{{ get_radio_fields(
'relational_display',
{
'K': 'Relational key'|trans,
@ -76,7 +76,7 @@
{% if possible_as_geometry %}
<div class="formelement">
{{ Util_getRadioFields(
{{ get_radio_fields(
'geoOption',
{
'GEOM': 'Geometry'|trans,
@ -93,7 +93,7 @@
{% else %}
<div class="formelement">
{{ possible_as_geometry }}
{{ Util_getRadioFields(
{{ get_radio_fields(
'geoOption',
{
'WKT': 'Well Known Text'|trans,

2
templates/display/results/show_all_checkbox.twig
View File

@ -1,6 +1,6 @@
<td>
<form action="sql.php" method="post">
{{ Url_getHiddenInputs(db, table) }}
{{ get_hidden_inputs(db, table) }}
<input type="hidden" name="sql_query" value="{{ html_sql_query|raw }}" />
<input type="hidden" name="pos" value="0" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />

2
templates/display/results/table_navigation_button.twig
View File

@ -1,6 +1,6 @@
<td>
<form action="sql.php" method="post"{{ onsubmit|raw }}>
{{ Url_getHiddenInputs(db, table) }}
{{ get_hidden_inputs(db, table) }}
<input type="hidden" name="sql_query" value="{{ sql_query|raw }}" />
<input type="hidden" name="pos" value="{{ pos }}" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />

4
templates/header_location.twig
View File

@ -8,14 +8,14 @@
<meta http-equiv="Refresh" content="0;url={{ uri }}" />
<script type="text/javascript">
//<![CDATA[
setTimeout(function() { window.location = decodeURI('{{ Sanitize_escapeJsString(uri) }}'); }, 2000);
setTimeout(function() { window.location = decodeURI('{{ uri|escape_js_string }}'); }, 2000);
//]]>
</script>
</head>
<body>
<script type="text/javascript">
//<![CDATA[
document.write('<p><a href="{{ Sanitize_escapeJsString(uri|e) }}">{% trans 'Go' %}</a></p>');
document.write('<p><a href="{{ uri|e|escape_js_string }}">{% trans 'Go' %}</a></p>');
//]]>
</script>
</body>

2
templates/list/item.twig
View File

@ -14,6 +14,6 @@
</a>
{% endif %}
{% if mysql_help_page is not empty %}
{{ Util_showMySQLDocu(mysql_help_page) }}
{{ show_mysql_docu(mysql_help_page) }}
{% endif %}
</li>

6
templates/login/header.twig
View File

@ -1,13 +1,13 @@
<div class="container">
<a href="{{ Url_link('https://www.phpmyadmin.net/') }}" target="_blank" rel="noopener noreferrer" class="logo">
<a href="{{ 'https://www.phpmyadmin.net/'|link }}" target="_blank" rel="noopener noreferrer" class="logo">
<img src="{{ theme.getImgPath('logo_right.png', 'pma_logo.png') }}" id="imLogo" name="imLogo" alt="phpMyAdmin" border="0" />
</a>
<h1>{{ 'Welcome to %s'|trans|format('<bdo dir="ltr" lang="en">phpMyAdmin</bdo>')|raw }}</h1>
<noscript>
{{ Message_error("Javascript must be enabled past this point!"|trans) }}
{{ "Javascript must be enabled past this point!"|trans|error }}
</noscript>
<div class="hide" id="js-https-mismatch">
{{ Message_error("There is mismatch between HTTPS indicated on the server and client. This can lead to non working phpMyAdmin or a security risk. Please fix your server configuration to indicate HTTPS properly."|trans) }}
{{ "There is mismatch between HTTPS indicated on the server and client. This can lead to non working phpMyAdmin or a security risk. Please fix your server configuration to indicate HTTPS properly."|trans|error }}
</div>

2
templates/login/twofactor.twig
View File

@ -1,5 +1,5 @@
<form method="POST" class="disableAjax">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{{ form|raw }}
{% if show_submit %}
<input type="submit" value="{% trans "Verify" %}" />

2
templates/login/twofactor/application_configure.twig
View File

@ -1,4 +1,4 @@
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{% if image is defined %}
<p>
{% trans "Please scan following QR code into the two-factor authentication app on your device and enter authentication code it generates." %}

6
templates/prefs_twofactor.twig
View File

@ -1,7 +1,7 @@
<div class="group">
<h2>
{% trans "Two-factor authentication status" %}
{{ Util_showDocu('two_factor') }}
{{ show_docu('two_factor') }}
</h2>
<div class="group-cnt">
{% if enabled %}
@ -33,7 +33,7 @@
<p>{% trans "You have enabled two factor authentication." %}</p>
<p>{{ backend_description }}</p>
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
<input type="submit" name="2fa_remove" value="{% trans "Disable two-factor authentication" %}" />
</form>
</div>
@ -43,7 +43,7 @@
<h2>{% trans "Configure two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{% for backend in backends %}
<label>
<input type="radio" name="2fa_configure" {% if backend["id"] == "" %}checked="checked"{% endif %} value="{{ backend["id"] }}"/>

2
templates/prefs_twofactor_configure.twig
View File

@ -2,7 +2,7 @@
<h2>{% trans "Configure two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
<input type="hidden" name="2fa_configure" value="{{ configure }}" />
{{ form|raw }}
<input type="submit" value="{% trans "Enable two-factor authentication" %}" />

4
templates/prefs_twofactor_confirm.twig
View File

@ -2,8 +2,8 @@
<h2>{% trans "Confirm disabling two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Message_notice("By disabling two factor authentication you will be again able to login using password only."|trans) }}
{{ Url_getHiddenInputs() }}
{{ "By disabling two factor authentication you will be again able to login using password only."|trans|notice }}
{{ get_hidden_inputs() }}
{{ form|raw }}
<input type="hidden" name="2fa_remove" value="1" />
<input type="submit" value="{% trans "Disable two-factor authentication" %}" />

4
templates/preview_sql.twig
View File

@ -3,9 +3,9 @@
{% trans 'No change' %}
{% elseif query_data is iterable %}
{% for query in query_data %}
{{ Util_formatSql(query) }}
{{ format_sql(query) }}
{% endfor %}
{% else %}
{{ Util_formatSql(query_data) }}
{{ format_sql(query_data) }}
{% endif %}
</div>

14
templates/privileges/add_privileges_database.twig
View File

@ -1,14 +0,0 @@
<label for="text_dbname">{% trans 'Add privileges on the following database(s):' %}</label>
{%- if databases is not empty %}
<select name="pred_dbname[]" multiple="multiple">
{% for database in databases %}
<option value="{{ Util_escapeMysqlWildcards(database) }}">
{{ database }}
</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_dbname" name="dbname" />
{{ Util_showHint("Wildcards % and _ should be escaped with a \\ to use them literally."|trans) }}

14
templates/privileges/add_privileges_routine.twig
View File

@ -1,14 +0,0 @@
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_routinename">{% trans 'Add privileges on the following routine:' %}</label>
{%- if routines is not empty %}
<select name="pred_routinename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for routine in routines %}
<option value="{{ routine }}">{{ routine }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_routinename" name="routinename" />

14
templates/privileges/add_privileges_table.twig
View File

@ -1,14 +0,0 @@
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_tablename">{% trans 'Add privileges on the following table:' %}</label>
{%- if tables is not empty %}
<select name="pred_tablename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for table in tables %}
<option value="{{ table }}">{{ table }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_tablename" name="tablename" />

8
templates/privileges/add_user_fieldset.twig
View File

@ -1,8 +0,0 @@
<fieldset id="fieldset_add_user">
<legend>{% trans %}New{% context %}Create new user{% endtrans %}</legend>
<a id="add_user_anchor" href="server_privileges.php{{ Url_getCommon(url_params) }}"
{% if rel_params is not empty %}
rel="{{ Url_getCommon(rel_params) }}"
{% endif %}>
{{ Util_getIcon('b_usradd') }}{% trans 'Add user account' %}</a>
</fieldset>

9
templates/privileges/global_priv_tbl_item.twig
View File

@ -1,9 +0,0 @@
<div class="item">
<input type="checkbox" class="checkall" name="{{ priv[0] }}_priv" id="checkbox_{{ priv[0] }}_priv"
value="Y" title="{{ priv[2] }}" {{ checked }} />
<label for="checkbox_{{ priv[0] }}_priv">
<code>
{{ formatted_priv|raw }}
</code>
</label>
</div>

62
templates/privileges/privileges_summary.twig
View File

@ -1,62 +0,0 @@
<form class="submenu-item" action="server_privileges.php" id="{{ form_id }}" method="post">
{{ Url_getHiddenInputs() }}
<input type="hidden" name="username" value="{{ username }}" />
<input type="hidden" name="hostname" value="{{ hostname }}" />
<fieldset>
<legend data-submenu-label="{{ sub_menu_label }}">
{{ legend }}
</legend>
<table class="data">
<thead>
<tr>
<th>{{ type_label }}</th>
<th>{% trans 'Privileges' %}</th>
<th>{% trans 'Grant' %}</th>
{% if type == 'database' %}
<th>{% trans 'Table-specific privileges' %}</th>
{% elseif type == 'table' %}
<th>{% trans 'Column-specific privileges' %}</th>
{% endif %}
<th colspan="2">{% trans 'Action' %}</th>
</tr>
</thead>
<tbody>
{% if privileges|length == 0 %}
{% set colspan = type == 'database' ? 7 : (type == 'table' ? 6 : 5) %}
<tr>
<td colspan="{{ colspan }}"><center><em>{% trans 'None' %}</em></center></td>
</tr>
{% else %}
{% for privilege in privileges %}
{% include 'privileges/privileges_summary_row.twig' with
privilege|merge({'type': type})
only %}
{% endfor %}
{% endif %}
</tbody>
</table>
{% if type == 'database' %}
{% include 'privileges/add_privileges_database.twig' with {
'databases': databases
} only %}
{% elseif type == 'table' %}
{% include 'privileges/add_privileges_table.twig' with {
'database': database,
'tables': tables
} only %}
{% else %}
{% include 'privileges/add_privileges_routine.twig' with {
'database': database,
'routines': routines
} only %}
{% endif %}
</fieldset>
<fieldset class="tblFooters">
<input type="submit" value="{% trans 'Go' %}" />
</fieldset>
</form>

14
templates/privileges/privileges_summary_row.twig
View File

@ -1,14 +0,0 @@
<tr>
<td>{{ name }}</td>
<td><code>{{ privileges|raw }}</code></td>
<td>{{ grant ? 'Yes'|trans : 'No'|trans }}</td>
{% if type == 'database' %}
<td>{{ table_privs ? 'Yes'|trans : 'No'|trans }}</td>
{% elseif type == 'table' %}
<td>{{ column_privs ? 'Yes'|trans : 'No'|trans }}</td>
{% endif %}
<td>{{ edit_link|raw }}</td>
<td>{{ revoke_link|raw }}</td>
</tr>

14
templates/privileges/require_options.twig
View File

@ -1,14 +0,0 @@
<fieldset>
<legend>SSL</legend>
<div id="require_ssl_div">
{% for require_option in require_options %}
{% if require_option['name'] is same as('ssl_cipher') %}
<div id="specified_div" style="padding-left:20px;">
{% endif %}
{% include 'privileges/require_options_item.twig' with {
'require_option': require_option
} only %}
{% endfor %}
</div>{# END specified_div #}
</div>{# END require_ssl_div #}
</fieldset>

23
templates/privileges/require_options_item.twig
View File

@ -1,23 +0,0 @@
<div class="item">
{% if require_option['radio'] %}
<input type="radio" name="ssl_type"
id="{{ require_option['name'] }}_{{ require_option['value'] }}"
title="{{ require_option['description'] }}"
value="{{ require_option['value'] }}" {{ require_option['checked']|raw -}}
/>
<label for="{{ require_option['name'] }}_{{ require_option['value'] }}">
<code>{{ require_option['label'] }}</code>
</label>
{% else %}
<label for="text_{{ require_option['name'] }}">
<code>{{ require_option['label'] }}</code>
</label>
<input type="text" name="{{ require_option['name'] }}"
id="text_{{ require_option['name'] }}" value="{{ require_option['value'] }}"
size="80" title="{{ require_option['description'] }}"
{%- if require_option['disabled'] %}
disabled
{%- endif -%}
/>
{% endif %}
</div>

11
templates/privileges/resource_limit_item.twig
View File

@ -1,11 +0,0 @@
<div class="item">
<label for="text_{{ limit['input_name'] }}">
<code>
<dfn title="{{ limit['description'] }}">
{{ limit['name_main'] }}
</dfn>
</code>
</label>
<input type="number" name="{{ limit['input_name'] }}" id="text_{{ limit['input_name'] }}"
value="{{ limit['value'] }}" title="{{ limit['description'] }}" />
</div>

13
templates/privileges/resource_limits.twig
View File

@ -1,13 +0,0 @@
<fieldset>
<legend>{% trans 'Resource limits' %}</legend>
<p>
<small>
<em>{% trans 'Note: Setting these options to 0 (zero) removes the limit.' %}</em>
</small>
</p>
{% for limit in limits %}
{% include 'privileges/resource_limit_item.twig' with {
'limit': limit
} only %}
{% endfor %}
</fieldset>

2
templates/secondary_tabs.twig
View File

@ -1,6 +1,6 @@
<ul id="topmenu2">
{% for tab in sub_tabs %}
{{ Util_getHtmlTab(tab, url_params) }}
{{ get_html_tab(tab, url_params) }}
{% endfor %}
</ul>
<div class="clearfloat"></div>

2
templates/select_lang.twig
View File

@ -1,5 +1,5 @@
<form method="get" action="index.php" class="disableAjax">
{{ Url_getHiddenInputs(_form_params) }}
{{ get_hidden_inputs(_form_params) }}
{% if use_fieldset %}
<fieldset>

2
templates/server/binlog/log_row.twig
View File

@ -6,5 +6,5 @@
<td class="right">
{{- value['Orig_log_pos'] is defined ? value['Orig_log_pos'] : value['End_log_pos'] -}}
</td>
<td>{{ Util_formatSql(value['Info'], not dontlimitchars) }}</td>
<td>{{ format_sql(value['Info'], not dontlimitchars) }}</td>
</tr>

6
templates/server/binlog/log_selector.twig
View File

@ -1,5 +1,5 @@
<form action="server_binlog.php" method="get">
{{ Url_getHiddenInputs(url_params) }}
{{ get_hidden_inputs(url_params) }}
<fieldset>
<legend>
{% trans 'Select binary log to view' %}
@ -11,7 +11,7 @@
{{- each_log['Log_name'] == log ? ' selected="selected"' }}>
{{ each_log['Log_name'] }}
{% if each_log['File_size'] is defined %}
({{ Util_formatByteDown(each_log['File_size'], 3, 2)|join(' ') }})
({{ format_byte_down(each_log['File_size'], 3, 2)|join(' ') }})
{% set full_size = full_size + each_log['File_size'] %}
{% endif %}
</option>
@ -20,7 +20,7 @@
{{ binary_logs|length }}
{% trans 'Files' %},
{% if full_size > 0 %}
{{ Util_formatByteDown(full_size)|join(' ') }}
{{ format_byte_down(full_size)|join(' ') }}
{% endif %}
</fieldset>
<fieldset class="tblFooters">

2
templates/server/collations/charsets.twig
View File

@ -18,7 +18,7 @@
{% for current_collation in mysql_collations[current_charset] %}
<tr class="{{ mysql_dft_collations[current_charset] == current_collation ? ' marked' }}">
<td>{{ current_collation }}</td>
<td>{{ Charsets_getCollationDescr(current_collation) }}</td>
<td>{{ get_collation_descr(current_collation) }}</td>
</tr>
{% endfor %}
{% endfor %}

8
templates/server/databases/databases_footer.twig
View File

@ -11,7 +11,7 @@
{% for stat_name, stat in column_order if stat_name in first_database|keys %}
<th class="value">
{% if stat['description_function'] is defined %}
<dfn title="{{ Charsets_getCollationDescr(stat['footer']) }}">
<dfn title="{{ get_collation_descr(stat['footer']) }}">
{{ values[stat_name] }}
</dfn>
{% else %}
@ -42,7 +42,7 @@
'form_name': 'dbStatsForm'
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'',
'mult_submit ajax',
'Drop'|trans,
@ -52,7 +52,7 @@
{# Enable statistics #}
{% if dbstats is empty %}
{{ Message_notice('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'|trans) }}
{{ 'Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'|trans|notice }}
{% set content %}
<strong>{% trans 'Enable statistics' %}</strong>
@ -61,7 +61,7 @@
'content': content,
'class': 'li_switch_dbstats',
'url': {
'href': 'server_databases.php' ~ Url_getCommon({'dbstats': '1'}),
'href': 'server_databases.php' ~ get_common({'dbstats': '1'}),
'title': 'Enable statistics'|trans
}
}] %}

26
templates/server/databases/index.twig
View File

@ -11,13 +11,13 @@
<form method="post" action="server_databases.php" id="create_database_form" class="ajax">
<p><strong>
<label for="text_create_db">
{{ Util_getImage('b_newdb') }}
{{ get_image('b_newdb') }}
{% trans 'Create database' %}
</label>
{{ Util_showMySQLDocu('CREATE_DATABASE') }}
{{ show_mysql_docu('CREATE_DATABASE') }}
</strong></p>
{{ Url_getHiddenInputs('', '', 5) }}
{{ get_hidden_inputs('', '', 5) }}
<input type="hidden" name="reload" value="1" />
{% if dbstats is not empty %}
<input type="hidden" name="dbstats" value="1" />
@ -26,7 +26,7 @@
<input type="text" name="new_db" value="{{ db_to_create }}"
maxlength="64" class="textfield" id="text_create_db" required
placeholder="{% trans 'Database name' %}" />
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'db_collation',
@ -39,13 +39,13 @@
{% else %}
{# db creation no privileges message #}
<p><strong>
{{ Util_getImage('b_newdb') }}
{{ get_image('b_newdb') }}
{% trans 'Create database' %}
{{ Util_showMySQLDocu('CREATE_DATABASE') }}
{{ show_mysql_docu('CREATE_DATABASE') }}
</strong></p>
<span class="noPrivileges">
{{ Util_getImage(
{{ get_image(
's_error',
'',
{'hspace': 2, 'border': 0, 'align': 'middle'}
@ -62,7 +62,7 @@
{# Displays the table #}
{% if databases is not null %}
<div id="tableslistcontainer">
{{ Util_getListNavigator(
{{ get_list_navigator(
database_count,
pos,
url_params,
@ -71,7 +71,7 @@
max_db_list
) }}
<form class="ajax" action="server_databases.php" method="post" name="dbStatsForm" id="dbStatsForm">
{{ Url_getHiddenInputs(url_params) }}
{{ get_hidden_inputs(url_params) }}
{% set url_params = url_params|merge({
'sort_by': 'SCHEMA_NAME',
'sort_order': sort_by == 'SCHEMA_NAME' and sort_order == 'asc' ? 'desc' : 'asc'
@ -84,9 +84,9 @@
<th></th>
{% endif %}
<th>
<a href="server_databases.php{{ Url_getCommon(url_params) }}">
<a href="server_databases.php{{ get_common(url_params) }}">
{% trans 'Database' %}
{{ sort_by == 'SCHEMA_NAME' ? Util_getImage(
{{ sort_by == 'SCHEMA_NAME' ? get_image(
's_' ~ sort_order,
sort_order == 'asc' ? 'Ascending'|trans : 'Descending'|trans
) }}
@ -99,9 +99,9 @@
}) %}
<th{{ stat['format'] is same as('byte') ? ' colspan="2"' }}>
<a href="server_databases.php{{ Url_getCommon(url_params) }}">
<a href="server_databases.php{{ get_common(url_params) }}">
{{ stat['disp_name'] }}
{{ sort_by == stat_name ? Util_getImage(
{{ sort_by == stat_name ? get_image(
's_' ~ sort_order,
sort_order == 'asc' ? 'Ascending'|trans : 'Descending'|trans
) }}

12
templates/server/databases/table_row.twig
View File

@ -8,8 +8,8 @@
</td>
{% endif %}
<td class="name">
<a href="{{ Util_getScriptNameForOption(default_tab_database, 'database') }}
{{- Url_getCommon({'db': current['SCHEMA_NAME']}) }}" title="
<a href="{{ get_script_name_for_option(default_tab_database, 'database') }}
{{- get_common({'db': current['SCHEMA_NAME']}) }}" title="
{{- "Jump to database '%s'"|trans|format(current['SCHEMA_NAME']|e) }}">
{{ current['SCHEMA_NAME'] }}
</a>
@ -17,7 +17,7 @@
{% for stat_name, stat in column_order if stat_name in current|keys %}
<td class="value">
{% if stat['description_function'] is defined %}
<dfn title="{{ Charsets_getCollationDescr(current[stat_name]) }}">
<dfn title="{{ get_collation_descr(current[stat_name]) }}">
{{ values[stat_name] }}
</dfn>
{% else %}
@ -43,13 +43,13 @@
<td class="tool">
<a class="server_databases" data="
{{- Sanitize_jsFormat(current['SCHEMA_NAME']) }}" href="server_privileges.php
{{- Url_getCommon({
{{- current['SCHEMA_NAME']|js_format }}" href="server_privileges.php
{{- get_common({
'db': current['SCHEMA_NAME'],
'checkprivsdb': current['SCHEMA_NAME']
}) }}" title="
{{- 'Check privileges for database "%s".'|trans|format(current['SCHEMA_NAME']|e) }}">
{{ Util_getIcon('s_rights', 'Check privileges'|trans) }}
{{ get_icon('s_rights', 'Check privileges'|trans) }}
</a>
</td>
</tr>

2
templates/server/engines/list_engines.twig
View File

@ -11,7 +11,7 @@
{{- details['Support'] == 'NO' or details['Support'] == 'DISABLED' ? ' disabled' }}
{{ details['Support'] == 'DEFAULT' ? ' marked' }}">
<td>
<a rel="newpage" href="server_engines.php{{ Url_getCommon({'engine': engine}) }}">
<a rel="newpage" href="server_engines.php{{ get_common({'engine': engine}) }}">
{{ details['Engine'] }}
</a>
</td>

8
templates/server/engines/show_engine.twig
View File

@ -1,7 +1,7 @@
<h2>
{{ Util_getImage('b_engine') }}
{{ get_image('b_engine') }}
{{ title }}
{{ Util_showMySQLDocu(help_page) }}
{{ show_mysql_docu(help_page) }}
</h2>
<p><em>{{ comment }}</em></p>
@ -12,7 +12,7 @@
<strong>{% trans 'Variables' %}</strong>
{% else %}
<a href="server_engines.php
{{- Url_getCommon({'engine': engine}) }}">
{{- get_common({'engine': engine}) }}">
{% trans 'Variables' %}
</a>
{% endif %}
@ -22,7 +22,7 @@
<strong>{{ label }}</strong>
{% else %}
<a href="server_engines.php
{{- Url_getCommon({'engine': engine, 'page': current}) }}">
{{- get_common({'engine': engine, 'page': current}) }}">
{{ label }}
</a>
{% endif %}

8
templates/server/privileges/add_user_fieldset.twig Normal file
View File

@ -0,0 +1,8 @@
<fieldset id="fieldset_add_user">
<legend>{% trans %}New{% context %}Create new user{% endtrans %}</legend>
<a id="add_user_anchor" href="server_privileges.php{{ get_common(url_params) }}"
{% if rel_params is not empty %}
rel="{{ get_common(rel_params) }}"
{% endif %}>
{{ get_icon('b_usradd') }}{% trans 'Add user account' %}</a>
</fieldset>

4
templates/privileges/choose_user_group.twig → templates/server/privileges/choose_user_group.twig
View File

@ -1,9 +1,9 @@
<form class="ajax" id="changeUserGroupForm" action="server_privileges.php" method="post">
{{ Url_getHiddenInputs(params) }}
{{ get_hidden_inputs(params) }}
<fieldset id="fieldset_user_group_selection">
<legend>{% trans 'User group' %}</legend>
{% trans 'User group' %}:
{{ Util_getDropdown('userGroup', all_user_groups, user_group, 'userGroup_select') }}
{{ get_dropdown('userGroup', all_user_groups, user_group, 'userGroup_select') }}
<input type="hidden" name="changeUserGroup" value="1">
</fieldset>
</form>

0
templates/privileges/column_privileges.twig → templates/server/privileges/column_privileges.twig
View File

2
templates/privileges/delete_user_fieldset.twig → templates/server/privileges/delete_user_fieldset.twig
View File

@ -1,6 +1,6 @@
<fieldset id="fieldset_delete_user">
<legend>
{{ Util_getIcon('b_usrdrop') }}{% trans 'Remove selected user accounts' %}
{{ get_icon('b_usrdrop') }}{% trans 'Remove selected user accounts' %}
</legend>
<input type="hidden" name="mode" value="2" />
<p>({% trans 'Revoke all active privileges from the users and delete them afterwards.' %})</p>

2
templates/privileges/edit_routine_privileges.twig → templates/server/privileges/edit_routine_privileges.twig
View File

@ -1,7 +1,7 @@
<div id="edit_user_dialog">
{{ header }}
<form class="submenu-item" name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
<input type="hidden" name="username" value="{{ username }}">
<input type="hidden" name="hostname" value="{{ hostname }}">
<input type="hidden" name="dbname" value="{{ database }}">

16
templates/privileges/global_priv_table.twig → templates/server/privileges/global_priv_table.twig
View File

@ -7,12 +7,16 @@
</legend>
{% for priv in table %}
{% set checked = row[priv[0] ~ '_priv'] is defined and row[priv[0] ~ '_priv'] == 'Y' ? ' checked="checked"' %}
{% set formatted_priv = ServerPrivileges_formatPrivilege(priv, true) %}
{% include 'privileges/global_priv_tbl_item.twig' with {
'checked': checked,
'formatted_priv': formatted_priv,
'priv': priv
} only %}
{% set formatted_priv = format_privilege(priv, true) %}
<div class="item">
<input type="checkbox" class="checkall" name="{{ priv[0] }}_priv" id="checkbox_{{ priv[0] }}_priv"
value="Y" title="{{ priv[2] }}" {{ checked }} />
<label for="checkbox_{{ priv[0] }}_priv">
<code>
{{ formatted_priv|raw }}
</code>
</label>
</div>
{% endfor %}
</fieldset>
{% endfor %}

4
templates/privileges/initials_row.twig → templates/server/privileges/initials_row.twig
View File

@ -6,7 +6,7 @@
<a class="ajax
{{- initial is defined and initial is same as(tmp_initial) ? ' active' -}}
" href="server_privileges.php
{{- Url_getCommon({'initial': tmp_initial}) }}">
{{- get_common({'initial': tmp_initial}) }}">
{{- tmp_initial|raw -}}
</a>
</td>
@ -16,7 +16,7 @@
{% endfor %}
<td>
<a href="server_privileges.php
{{- Url_getCommon({'showall': 1}) }}" class="nowrap">
{{- get_common({'showall': 1}) }}" class="nowrap">
{% trans 'Show all' %}
</a>
</td>

104
templates/server/privileges/privileges_summary.twig Normal file
View File

@ -0,0 +1,104 @@
<form class="submenu-item" action="server_privileges.php" id="{{ form_id }}" method="post">
{{ get_hidden_inputs() }}
<input type="hidden" name="username" value="{{ username }}" />
<input type="hidden" name="hostname" value="{{ hostname }}" />
<fieldset>
<legend data-submenu-label="{{ sub_menu_label }}">
{{ legend }}
</legend>
<table class="data">
<thead>
<tr>
<th>{{ type_label }}</th>
<th>{% trans 'Privileges' %}</th>
<th>{% trans 'Grant' %}</th>
{% if type == 'database' %}
<th>{% trans 'Table-specific privileges' %}</th>
{% elseif type == 'table' %}
<th>{% trans 'Column-specific privileges' %}</th>
{% endif %}
<th colspan="2">{% trans 'Action' %}</th>
</tr>
</thead>
<tbody>
{% if privileges|length == 0 %}
{% set colspan = type == 'database' ? 7 : (type == 'table' ? 6 : 5) %}
<tr>
<td colspan="{{ colspan }}"><center><em>{% trans 'None' %}</em></center></td>
</tr>
{% else %}
{% for privilege in privileges %}
<tr>
<td>{{ privilege['name'] }}</td>
<td><code>{{ privilege['privileges']|raw }}</code></td>
<td>{{ privilege['grant'] ? 'Yes'|trans : 'No'|trans }}</td>
{% if type == 'database' %}
<td>{{ privilege['table_privs'] ? 'Yes'|trans : 'No'|trans }}</td>
{% elseif type == 'table' %}
<td>{{ privilege['column_privs'] ? 'Yes'|trans : 'No'|trans }}</td>
{% endif %}
<td>{{ privilege['edit_link']|raw }}</td>
<td>{{ privilege['revoke_link']|raw }}</td>
</tr>
{% endfor %}
{% endif %}
</tbody>
</table>
{% if type == 'database' %}
<label for="text_dbname">{% trans 'Add privileges on the following database(s):' %}</label>
{%- if databases is not empty %}
<select name="pred_dbname[]" multiple="multiple">
{% for database in databases %}
<option value="{{ database|escape_mysql_wildcards }}">
{{ database }}
</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_dbname" name="dbname" />
{{ show_hint("Wildcards % and _ should be escaped with a \\ to use them literally."|trans) }}
{% elseif type == 'table' %}
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_tablename">{% trans 'Add privileges on the following table:' %}</label>
{%- if tables is not empty %}
<select name="pred_tablename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for table in tables %}
<option value="{{ table }}">{{ table }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_tablename" name="tablename" />
{% else %}
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_routinename">{% trans 'Add privileges on the following routine:' %}</label>
{%- if routines is not empty %}
<select name="pred_routinename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for routine in routines %}
<option value="{{ routine }}">{{ routine }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_routinename" name="routinename" />
{% endif %}
</fieldset>
<fieldset class="tblFooters">
<input type="submit" value="{% trans 'Go' %}" />
</fieldset>
</form>

34
templates/server/privileges/require_options.twig Normal file
View File

@ -0,0 +1,34 @@
<fieldset>
<legend>SSL</legend>
<div id="require_ssl_div">
{% for require_option in require_options %}
{% if require_option['name'] is same as('ssl_cipher') %}
<div id="specified_div" style="padding-left:20px;">
{% endif %}
<div class="item">
{% if require_option['radio'] %}
<input type="radio" name="ssl_type"
id="{{ require_option['name'] }}_{{ require_option['value'] }}"
title="{{ require_option['description'] }}"
value="{{ require_option['value'] }}" {{ require_option['checked']|raw -}}
/>
<label for="{{ require_option['name'] }}_{{ require_option['value'] }}">
<code>{{ require_option['label'] }}</code>
</label>
{% else %}
<label for="text_{{ require_option['name'] }}">
<code>{{ require_option['label'] }}</code>
</label>
<input type="text" name="{{ require_option['name'] }}"
id="text_{{ require_option['name'] }}" value="{{ require_option['value'] }}"
size="80" title="{{ require_option['description'] }}"
{%- if require_option['disabled'] %}
disabled
{%- endif -%}
/>
{% endif %}
</div>
{% endfor %}
</div>{# END specified_div #}
</div>{# END require_ssl_div #}
</fieldset>

21
templates/server/privileges/resource_limits.twig Normal file
View File

@ -0,0 +1,21 @@
<fieldset>
<legend>{% trans 'Resource limits' %}</legend>
<p>
<small>
<em>{% trans 'Note: Setting these options to 0 (zero) removes the limit.' %}</em>
</small>
</p>
{% for limit in limits %}
<div class="item">
<label for="text_{{ limit['input_name'] }}">
<code>
<dfn title="{{ limit['description'] }}">
{{ limit['name_main'] }}
</dfn>
</code>
</label>
<input type="number" name="{{ limit['input_name'] }}" id="text_{{ limit['input_name'] }}"
value="{{ limit['value'] }}" title="{{ limit['description'] }}" />
</div>
{% endfor %}
</fieldset>

Some files were not shown because too many files have changed in this diff Show More