';
reset($this->_databases);
$first_database = current($this->_databases);
// table col order
- $column_order = PMA_getColumnOrder();
+ $column_order = $this->_getColumnOrder();
$_url_params = array(
'pos' => $this->_pos,
@@ -257,6 +319,52 @@ class ServerDatabasesController extends Controller
return $html;
}
+ /**
+ * Prepares the $column_order array
+ *
+ * @return array
+ */
+ private function _getColumnOrder()
+ {
+ $column_order = array();
+ $column_order['DEFAULT_COLLATION_NAME'] = array(
+ 'disp_name' => __('Collation'),
+ 'description_function' => 'PMA_getCollationDescr',
+ 'format' => 'string',
+ 'footer' => PMA_getServerCollation(),
+ );
+ $column_order['SCHEMA_TABLES'] = array(
+ 'disp_name' => __('Tables'),
+ 'format' => 'number',
+ 'footer' => 0,
+ );
+ $column_order['SCHEMA_TABLE_ROWS'] = array(
+ 'disp_name' => __('Rows'),
+ 'format' => 'number',
+ 'footer' => 0,
+ );
+ $column_order['SCHEMA_DATA_LENGTH'] = array(
+ 'disp_name' => __('Data'),
+ 'format' => 'byte',
+ 'footer' => 0,
+ );
+ $column_order['SCHEMA_INDEX_LENGTH'] = array(
+ 'disp_name' => __('Indexes'),
+ 'format' => 'byte',
+ 'footer' => 0,
+ );
+ $column_order['SCHEMA_LENGTH'] = array(
+ 'disp_name' => __('Total'),
+ 'format' => 'byte',
+ 'footer' => 0,
+ );
+ // At this point we were preparing the display of Overhead using DATA_FREE
+ // but its content does not represent the real overhead in the case
+ // of InnoDB
+
+ return $column_order;
+ }
+
/**
* Returns the html for Table footer buttons
*
@@ -291,8 +399,8 @@ class ServerDatabasesController extends Controller
*
* @return string
*/
- private function _getHtmlForTableFooter($column_order, $first_database) {
-
+ private function _getHtmlForTableFooter($column_order, $first_database)
+ {
return Template::get('server/databases/table_footer')->render(
array(
'column_order' => $column_order,
@@ -312,9 +420,8 @@ class ServerDatabasesController extends Controller
*
* @return string
*/
- private function _getHtmlForTableBody(
- $column_order, $replication_types
- ) {
+ private function _getHtmlForTableBody($column_order, $replication_types)
+ {
$odd_row = true;
$html = '
' . "\n";
@@ -325,7 +432,7 @@ class ServerDatabasesController extends Controller
}
$odd_row = ! $odd_row;
- $generated_html = PMA_buildHtmlForDb(
+ $generated_html = $this->_buildHtmlForDb(
$current,
$GLOBALS['is_superuser'],
$GLOBALS['url_query'],
@@ -341,6 +448,77 @@ class ServerDatabasesController extends Controller
return $html;
}
+ /**
+ * Builds the HTML for one database to display in the list
+ * of databases from server_databases.php
+ *
+ * @param array $current current database
+ * @param boolean $is_superuser user status
+ * @param string $url_query url query
+ * @param array $column_order column order
+ * @param array $replication_types replication types
+ * @param array $replication_info replication info
+ * @param string $tr_class HTMl class for the row
+ *
+ * @return array $column_order, $out
+ */
+ function _buildHtmlForDb(
+ $current, $is_superuser, $url_query, $column_order,
+ $replication_types, $replication_info, $tr_class = ''
+ ) {
+ $master_replication = $slave_replication = '';
+ foreach ($replication_types as $type) {
+ if ($replication_info[$type]['status']) {
+ $out = '';
+ $key = array_search(
+ $current["SCHEMA_NAME"],
+ $replication_info[$type]['Ignore_DB']
+ );
+ if (/*overload*/mb_strlen($key) > 0) {
+ $out = Util::getIcon(
+ 's_cancel.png',
+ __('Not replicated')
+ );
+ } else {
+ $key = array_search(
+ $current["SCHEMA_NAME"], $replication_info[$type]['Do_DB']
+ );
+
+ if (/*overload*/mb_strlen($key) > 0
+ || (isset($replication_info[$type]['Do_DB'][0])
+ && $replication_info[$type]['Do_DB'][0] == ""
+ && count($replication_info[$type]['Do_DB']) == 1)
+ ) {
+ // if ($key != null) did not work for index "0"
+ $out = Util::getIcon(
+ 's_success.png',
+ __('Replicated')
+ );
+ }
+ }
+
+ if ($type == 'master') {
+ $master_replication = $out;
+ } elseif ($type == 'slave') {
+ $slave_replication = $out;
+ }
+ }
+ }
+
+ return Template::get('server/databases/table_row')->render(
+ array(
+ 'current' => $current,
+ 'tr_class' => $tr_class,
+ 'url_query' => $url_query,
+ 'column_order' => $column_order,
+ 'master_replication_status' => $GLOBALS['replication_info']['master']['status'],
+ 'master_replication' => $master_replication,
+ 'slave_replication_status' => $GLOBALS['replication_info']['slave']['status'],
+ 'slave_replication' => $slave_replication,
+ )
+ );
+ }
+
/**
* Returns the html for table header
*
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
deleted file mode 100644
index 5dfb1367d5..0000000000
--- a/libraries/display_create_database.lib.php
+++ /dev/null
@@ -1,61 +0,0 @@
-';
- $html .= ' '
- . PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE');
- $html .= '
';
- $html .= PMA_URL_getHiddenInputs('', '', 5);
- $html .= '';
- $html .= '';
-
- include_once './libraries/mysql_charsets.inc.php';
- $html .= PMA_generateCharsetDropdownBox(
- PMA_CSDROPDOWN_COLLATION,
- 'db_collation',
- null,
- null,
- true
- );
-
- if (! empty($dbstats)) {
- $html .= '';
- }
-
- $html .= '';
- $html .= '';
-} else {
- $html .= '';
- $html .= '' . __('Create database:') . ' '
- . PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE')
- . '
';
-
- $html .= ''
- . PMA\libraries\Util::getImage(
- 's_error2.png',
- '',
- array('hspace' => 2, 'border' => 0, 'align' => 'middle')
- )
- . '' . __('No Privileges') . '';
-} // end create db form or message
diff --git a/templates/server/databases/create.phtml b/templates/server/databases/create.phtml
new file mode 100644
index 0000000000..1fd91bc1ae
--- /dev/null
+++ b/templates/server/databases/create.phtml
@@ -0,0 +1,36 @@
+
+ -
+
+
+
+
+
+
+
+
+
+
+ 2, 'border' => 0, 'align' => 'middle')) . ' ' . __('No Privileges'); ?>
+
+
+
+
\ No newline at end of file
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index 738a1ca4c8..74d6504e33 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -271,4 +271,60 @@ class ServerDatabasesControllerTest extends PHPUnit_Framework_TestCase
$propertySortOrder->getValue($ctrl)
);
}
+
+ /**
+ * Tests for _getColumnOrder()
+ *
+ * @return void
+ */
+ public function testGetColumnOrder()
+ {
+ $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
+ $method = $class->getMethod('_getColumnOrder');
+ $method->setAccessible(true);
+
+ $container = Container::getDefaultContainer();
+ $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
+ $container->alias(
+ 'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
+ );
+ $ctrl = $container->get('ServerDatabasesController');
+
+ $this->assertEquals(
+ array(
+ 'DEFAULT_COLLATION_NAME' => array(
+ 'disp_name' => __('Collation'),
+ 'description_function' => 'PMA_getCollationDescr',
+ 'format' => 'string',
+ 'footer' => 'utf8_general_ci'
+ ),
+ 'SCHEMA_TABLES' => array(
+ 'disp_name' => __('Tables'),
+ 'format' => 'number',
+ 'footer' => 0
+ ),
+ 'SCHEMA_TABLE_ROWS' => array(
+ 'disp_name' => __('Rows'),
+ 'format' => 'number',
+ 'footer' => 0
+ ),
+ 'SCHEMA_DATA_LENGTH' => array(
+ 'disp_name' => __('Data'),
+ 'format' => 'byte',
+ 'footer' => 0
+ ),
+ 'SCHEMA_INDEX_LENGTH' => array(
+ 'disp_name' => __('Indexes'),
+ 'format' => 'byte',
+ 'footer' => 0
+ ),
+ 'SCHEMA_LENGTH' => array(
+ 'disp_name' => __('Total'),
+ 'format' => 'byte',
+ 'footer' => 0
+ )
+ ),
+ $method->invoke($ctrl)
+ );
+ }
}
diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php
deleted file mode 100644
index 0d76efa188..0000000000
--- a/test/libraries/PMA_build_html_for_db_test.php
+++ /dev/null
@@ -1,102 +0,0 @@
-getPath();
- $GLOBALS['pmaThemeImage'] = 'theme/';
-
- $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
- }
-
- /**
- * Test for PMA_getColumnOrder
- *
- * @return void
- */
- public function testGetColumnOrder()
- {
- $this->assertEquals(
- array(
- 'DEFAULT_COLLATION_NAME' => array(
- 'disp_name' => __('Collation'),
- 'description_function' => 'PMA_getCollationDescr',
- 'format' => 'string',
- 'footer' => 'utf8_general_ci'
- ),
- 'SCHEMA_TABLES' => array(
- 'disp_name' => __('Tables'),
- 'format' => 'number',
- 'footer' => 0
- ),
- 'SCHEMA_TABLE_ROWS' => array(
- 'disp_name' => __('Rows'),
- 'format' => 'number',
- 'footer' => 0
- ),
- 'SCHEMA_DATA_LENGTH' => array(
- 'disp_name' => __('Data'),
- 'format' => 'byte',
- 'footer' => 0
- ),
- 'SCHEMA_INDEX_LENGTH' => array(
- 'disp_name' => __('Indexes'),
- 'format' => 'byte',
- 'footer' => 0
- ),
- 'SCHEMA_LENGTH' => array(
- 'disp_name' => __('Total'),
- 'format' => 'byte',
- 'footer' => 0
- )
- ),
- PMA_getColumnOrder()
- );
- }
-}
diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php
index 638bfc44ee..15a4317edf 100644
--- a/test/libraries/core/PMA_checkPageValidity_test.php
+++ b/test/libraries/core/PMA_checkPageValidity_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/core.lib.php';
class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
{
protected $goto_whitelist = array(
- 'db_create.php',
'db_datadict.php',
'db_sql.php',
'db_export.php',