Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-11-27 11:54:29 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-11-27 11:54:29 +0300
commit2692af32d9e875043db7d52f726938ea1426614a (patch)
tree8ffd1c236fe1b8739bc726acea6ec2ad6776a39a /server_collations.php
parent84f57eaf2fc57042de0718f4d3da30e97a013192 (diff)
Use a controller for server_collations page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'server_collations.php')
-rw-r--r--server_collations.php45
1 files changed, 20 insertions, 25 deletions
diff --git a/server_collations.php b/server_collations.php
index a44d5fbe42..adbd9536a4 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -1,37 +1,32 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
+
/**
- * Server collations page
+ * Handles server charsets and collations page.
*
* @package PhpMyAdmin
*/
-/**
- * requirements
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * Does the common work
- */
-require_once 'libraries/server_common.inc.php';
+namespace PMA;
-require_once 'libraries/server_collations.lib.php';
+use PMA\libraries\controllers\server\ServerCollationsController;
+use PMA\libraries\Response;
-/**
- * Includes the required charset library
- */
-require_once 'libraries/mysql_charsets.inc.php';
+require_once 'libraries/common.inc.php';
-$response = PMA\libraries\Response::getInstance();
+$container = libraries\di\Container::getDefaultContainer();
+$container->factory(
+ 'PMA\libraries\controllers\server\ServerCollationsController'
+);
+$container->alias(
+ 'ServerCollationsController',
+ 'PMA\libraries\controllers\server\ServerCollationsController'
+);
+$container->set('PMA\libraries\Response', Response::getInstance());
+$container->alias('response', 'PMA\libraries\Response');
-$response->addHTML(PMA_getHtmlForSubPageHeader('collations'));
-$response->addHTML(
- PMA_getHtmlForCharsets(
- $mysql_charsets,
- $mysql_collations,
- $mysql_charsets_descriptions,
- $mysql_default_collations,
- $mysql_collations_available
- )
+/** @var ServerCollationsController $controller */
+$controller = $container->get(
+ 'ServerCollationsController', array()
);
+$controller->indexAction();