diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php index 05ad782e81c4..67596d62654a 100644 --- a/libraries/classes/Controllers/Database/DatabaseStructureController.php +++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php @@ -371,18 +371,23 @@ protected function displayTableList() { // filtering $this->response->addHTML( - Template::get('filter')->render(array('filter_value'=>'')) + Template::get('filter')->render(array('filter_value' => '')) ); // table form $this->response->addHTML( - Template::get('database/structure/table_header') - ->render( - array( - 'db' => $this->db, - 'db_is_system_schema' => $this->_db_is_system_schema, - 'replication' => $GLOBALS['replication_info']['slave']['status'], - ) - ) + Template::get('database/structure/table_header')->render([ + 'db' => $this->db, + 'db_is_system_schema' => $this->_db_is_system_schema, + 'replication' => $GLOBALS['replication_info']['slave']['status'], + 'properties_num_columns' => $GLOBALS['cfg']['PropertiesNumColumns'], + 'is_show_stats' => $GLOBALS['is_show_stats'], + 'show_charset' => $GLOBALS['cfg']['ShowDbStructureCharset'], + 'show_comment' => $GLOBALS['cfg']['ShowDbStructureComment'], + 'show_creation' => $GLOBALS['cfg']['ShowDbStructureCreation'], + 'show_last_update' => $GLOBALS['cfg']['ShowDbStructureLastUpdate'], + 'show_last_check' => $GLOBALS['cfg']['ShowDbStructureLastCheck'], + 'num_favorite_tables' => $GLOBALS['cfg']['NumFavoriteTables'], + ]) ); $i = $sum_entries = 0; @@ -604,13 +609,19 @@ protected function displayTableList() ); $this->response->addHTML( - Template::get('database/structure/table_header')->render( - array( - 'db' => $this->db, - 'db_is_system_schema' => $this->_db_is_system_schema, - 'replication' => $GLOBALS['replication_info']['slave']['status'] - ) - ) + Template::get('database/structure/table_header')->render([ + 'db' => $this->db, + 'db_is_system_schema' => $this->_db_is_system_schema, + 'replication' => $GLOBALS['replication_info']['slave']['status'], + 'properties_num_columns' => $GLOBALS['cfg']['PropertiesNumColumns'], + 'is_show_stats' => $GLOBALS['is_show_stats'], + 'show_charset' => $GLOBALS['cfg']['ShowDbStructureCharset'], + 'show_comment' => $GLOBALS['cfg']['ShowDbStructureComment'], + 'show_creation' => $GLOBALS['cfg']['ShowDbStructureCreation'], + 'show_last_update' => $GLOBALS['cfg']['ShowDbStructureLastUpdate'], + 'show_last_check' => $GLOBALS['cfg']['ShowDbStructureLastCheck'], + 'num_favorite_tables' => $GLOBALS['cfg']['NumFavoriteTables'], + ]) ); } @@ -654,7 +665,6 @@ protected function displayTableList() 'is_show_stats' => $this->_is_show_stats, 'ignored' => $ignored, 'do' => $do, - 'colspan_for_structure' => $GLOBALS['colspan_for_structure'], 'approx_rows' => $approx_rows, 'show_superscript' => $show_superscript, 'already_favorite' => $this->checkFavoriteTable( diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 0d78c0012915..9b8c44ec34fb 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -3759,7 +3759,8 @@ public static function getHtmlForInitials(array $array_initials) $html_output = Template::get('privileges/initials_row') ->render( array( - 'array_initials' => $array_initials + 'array_initials' => $array_initials, + 'initial' => $_REQUEST['initial'], ) ); diff --git a/libraries/classes/Twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php index 3420daa024b8..a3ca99f014f0 100644 --- a/libraries/classes/Twig/SanitizeExtension.php +++ b/libraries/classes/Twig/SanitizeExtension.php @@ -30,6 +30,11 @@ public function getFunctions() 'PhpMyAdmin\Sanitize::escapeJsString', array('is_safe' => array('html')) ), + new Twig_SimpleFunction( + 'Sanitize_sanitize', + 'PhpMyAdmin\Sanitize::sanitize', + array('is_safe' => array('html')) + ), ); } } diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php index 206eff8fd5f9..b98115da7a6b 100644 --- a/libraries/classes/Twig/UtilExtension.php +++ b/libraries/classes/Twig/UtilExtension.php @@ -144,6 +144,11 @@ public function getFunctions() 'PhpMyAdmin\Util::showMySQLDocu', array('is_safe' => array('html')) ), + new Twig_SimpleFunction( + 'Util_sortableTableHeader', + 'PhpMyAdmin\Util::sortableTableHeader', + array('is_safe' => array('html')) + ), ); } } diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index c348e0d00f48..e69b1acbb19f 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -184,6 +184,39 @@ {% endif %} {% else %} + {% set count = 0 %} + {% if properties_num_columns %} + {% set count = count + 2 %} + {% endif %} + {% if is_show_stats %} + {% set count = count + 2 %} + {% endif %} + {% if show_charset %} + {% set count = count + 1 %} + {% endif %} + {% if show_comment %} + {% set count = count + 1 %} + {% endif %} + {% if show_creation %} + {% set count = count + 1 %} + {% endif %} + {% if show_last_update %} + {% set count = count + 1 %} + {% endif %} + {% if show_last_check %} + {% set count = count + 1 %} + {% endif %} + + {% if db_is_system_schema %} + {% set action_colspan = 3 %} + {% else %} + {% set action_colspan = 6 %} + {% endif %} + {% if num_favorite_tables > 0 %} + {% set action_colspan = action_colspan + 1 %} + {% endif %} + + {% set colspan_for_structure = action_colspan + 3 %}