diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 473698be0e..c85c5cc246 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -1382,27 +1382,21 @@ class Privileges /** * Get HTML snippet for global privileges table with check boxes * - * @param array $privTable privileges table array - * @param array $privTable_names names of the privilege tables - * (Data, Structure, Administration) - * @param array $row first row from result or boolean false + * @param array $privTable privileges table array + * @param array $privTableNames names of the privilege tables + * (Data, Structure, Administration) + * @param array $row first row from result or boolean false * * @return string $html_output */ public static function getHtmlForGlobalPrivTableWithCheckboxes( - $privTable, $privTable_names, $row + $privTable, $privTableNames, $row ) { - $html_output = ''; - $html_output = Template::get('privileges/global_priv_table') - ->render( - array( - 'privTable' => $privTable, - 'privTable_names' => $privTable_names, - 'row' => $row - ) - ); - - return $html_output; + return Template::get('privileges/global_priv_table')->render(array( + 'priv_table' => $privTable, + 'priv_table_names' => $privTableNames, + 'row' => $row, + )); } /** @@ -3325,22 +3319,22 @@ class Privileges ) { $uiData = array( 'database' => array( - 'formId' => 'database_specific_priv', - 'subMenuLabel' => __('Database'), - 'legend' => __('Database-specific privileges'), - 'typeLabel' => __('Database'), + 'form_id' => 'database_specific_priv', + 'sub_menu_label' => __('Database'), + 'legend' => __('Database-specific privileges'), + 'type_label' => __('Database'), ), 'table' => array( - 'formId' => 'table_specific_priv', - 'subMenuLabel' => __('Table'), - 'legend' => __('Table-specific privileges'), - 'typeLabel' => __('Table'), + 'form_id' => 'table_specific_priv', + 'sub_menu_label' => __('Table'), + 'legend' => __('Table-specific privileges'), + 'type_label' => __('Table'), ), 'routine' => array( - 'formId' => 'routine_specific_priv', - 'subMenuLabel' => __('Routine'), - 'legend' => __('Routine-specific privileges'), - 'typeLabel' => __('Routine'), + 'form_id' => 'routine_specific_priv', + 'sub_menu_label' => __('Routine'), + 'legend' => __('Routine-specific privileges'), + 'type_label' => __('Routine'), ), ); @@ -3429,8 +3423,8 @@ class Privileges $data = $uiData[$type]; $data['privileges'] = $privileges; - $data['userName'] = $username; - $data['hostName'] = $hostname; + $data['username'] = $username; + $data['hostname'] = $hostname; $data['database'] = $dbname; $data['type'] = $type; diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php index e1974b27f0..c2897b09e6 100644 --- a/libraries/classes/Template.php +++ b/libraries/classes/Template.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Twig\CharsetsExtension; use PhpMyAdmin\Twig\I18nExtension; use PhpMyAdmin\Twig\MessageExtension; use PhpMyAdmin\Twig\SanitizeExtension; +use PhpMyAdmin\Twig\ServerPrivilegesExtension; use PhpMyAdmin\Twig\UrlExtension; use PhpMyAdmin\Twig\UtilExtension; use Twig_Environment; @@ -75,6 +76,7 @@ class Template $this->twig->addExtension(new I18nExtension()); $this->twig->addExtension(new MessageExtension()); $this->twig->addExtension(new SanitizeExtension()); + $this->twig->addExtension(new ServerPrivilegesExtension()); $this->twig->addExtension(new UrlExtension()); $this->twig->addExtension(new UtilExtension()); } diff --git a/libraries/classes/Twig/ServerPrivilegesExtension.php b/libraries/classes/Twig/ServerPrivilegesExtension.php new file mode 100644 index 0000000000..eaad1facb4 --- /dev/null +++ b/libraries/classes/Twig/ServerPrivilegesExtension.php @@ -0,0 +1,35 @@ + array('html')) + ), + ); + } +} diff --git a/scripts/generate-twig-cache b/scripts/generate-twig-cache index a03e3264f5..90269d3141 100644 --- a/scripts/generate-twig-cache +++ b/scripts/generate-twig-cache @@ -8,6 +8,7 @@ use PhpMyAdmin\Twig\CharsetsExtension; use PhpMyAdmin\Twig\I18nExtension; use PhpMyAdmin\Twig\MessageExtension; use PhpMyAdmin\Twig\SanitizeExtension; +use PhpMyAdmin\Twig\ServerPrivilegesExtension; use PhpMyAdmin\Twig\UrlExtension; use PhpMyAdmin\Twig\UtilExtension; @@ -24,6 +25,7 @@ $twig->addExtension(new CharsetsExtension()); $twig->addExtension(new I18nExtension()); $twig->addExtension(new MessageExtension()); $twig->addExtension(new SanitizeExtension()); +$twig->addExtension(new ServerPrivilegesExtension()); $twig->addExtension(new UrlExtension()); $twig->addExtension(new UtilExtension()); diff --git a/templates/privileges/global_priv_table.phtml b/templates/privileges/global_priv_table.phtml deleted file mode 100644 index 73f0ab856d..0000000000 --- a/templates/privileges/global_priv_table.phtml +++ /dev/null @@ -1,23 +0,0 @@ - $table) : ?> -
- - - - - - - - render( - array( - 'checked' => $checked, - 'formatted_priv' => $formatted_priv, - 'priv' => $priv - ) - ); - ?> - -
- \ No newline at end of file diff --git a/templates/privileges/global_priv_table.twig b/templates/privileges/global_priv_table.twig new file mode 100644 index 0000000000..8a6d115582 --- /dev/null +++ b/templates/privileges/global_priv_table.twig @@ -0,0 +1,18 @@ +{% for key, table in priv_table %} +
+ + + + + {% 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 %} + {% endfor %} +
+{% endfor %} diff --git a/templates/privileges/privileges_summary.phtml b/templates/privileges/privileges_summary.phtml deleted file mode 100644 index 3e235d92a9..0000000000 --- a/templates/privileges/privileges_summary.phtml +++ /dev/null @@ -1,65 +0,0 @@ - - diff --git a/templates/privileges/privileges_summary.twig b/templates/privileges/privileges_summary.twig new file mode 100644 index 0000000000..266697bf9d --- /dev/null +++ b/templates/privileges/privileges_summary.twig @@ -0,0 +1,62 @@ + diff --git a/templates/privileges/require_options.phtml b/templates/privileges/require_options.phtml deleted file mode 100644 index e43e1a292f..0000000000 --- a/templates/privileges/require_options.phtml +++ /dev/null @@ -1,16 +0,0 @@ -
- SSL -
- - -
- - render( - array('require_option' => $require_option) - ); - ?> - -
-
-
\ No newline at end of file diff --git a/templates/privileges/require_options.twig b/templates/privileges/require_options.twig new file mode 100644 index 0000000000..157f27230d --- /dev/null +++ b/templates/privileges/require_options.twig @@ -0,0 +1,14 @@ +
+ SSL +
+ {% for require_option in require_options %} + {% if require_option['name'] is same as('ssl_cipher') %} +
+ {% endif %} + {% include 'privileges/require_options_item.twig' with { + 'require_option': require_option + } only %} + {% endfor %} +
{# END specified_div #} +
{# END require_ssl_div #} +
diff --git a/templates/privileges/resource_limits.phtml b/templates/privileges/resource_limits.phtml deleted file mode 100644 index 5bafa29066..0000000000 --- a/templates/privileges/resource_limits.phtml +++ /dev/null @@ -1,16 +0,0 @@ -
- -

- - - -

- - render( - array('limit' => $limit) - ); - ?> - -
- diff --git a/templates/privileges/resource_limits.twig b/templates/privileges/resource_limits.twig new file mode 100644 index 0000000000..dc1aaf988d --- /dev/null +++ b/templates/privileges/resource_limits.twig @@ -0,0 +1,13 @@ +
+ {% trans 'Resource limits' %} +

+ + <{% trans 'Note: Setting these options to 0 (zero) removes the limit.' %} + +

+ {% for limit in limits %} + {% include 'privileges/resource_limit_item.twig' with { + 'limit': limit + } only %} + {% endfor %} +
diff --git a/templates/server/variables/variable_row.phtml b/templates/server/variables/variable_row.phtml deleted file mode 100644 index 9b158a7ca3..0000000000 --- a/templates/server/variables/variable_row.phtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - ' - ?> - - - - - - - - - - - - - diff --git a/templates/server/variables/variable_row.twig b/templates/server/variables/variable_row.twig new file mode 100644 index 0000000000..710f5d0eef --- /dev/null +++ b/templates/server/variables/variable_row.twig @@ -0,0 +1,29 @@ + + + {% if editable %} + {{ Util_getIcon('b_edit.png', 'Edit'|trans) }} + {% else %} + + {{ Util_getIcon('bd_edit.png', 'Edit'|trans) }} + + {% endif %} + + + {% if doc_link != null %} + + {{ Util_showMySQLDocu(doc_link[1], false, doc_link[2] ~ '_' ~ doc_link[0], true) }} + {{ name|e|replace({'_': ' '})|raw }} + + + {% else %} + {{ name|replace({'_': ' '}) }} + {% endif %} + + + {% if is_html_formatted == false %} + {{ value|e|replace({',': ',​'})|raw }} + {% else %} + {{ value }} + {% endif %} + +