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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-11 14:37:37 +02:00
commit 0f8c79de00
22 changed files with 269 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_create.php
View File

@ -10,7 +10,7 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
if (! PMA_DRIZZLE) {
include_once 'libraries/replication.inc.php';
}

2
db_operations.php
View File

@ -16,7 +16,7 @@
* requirements
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* functions implementation for this script

2
db_routines.php
View File

@ -11,7 +11,7 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* Include all other files

2
db_structure.php
View File

@ -74,7 +74,7 @@ if (empty($_POST['is_info'])) {
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
$db_collation = PMA_getDbCollation($db);
$titles = PMA_Util::buildActionTitles();

2
libraries/DatabaseInterface.class.php
View File

@ -905,7 +905,7 @@ class PMA_DatabaseInterface
$databases[$database_name]['SCHEMA_NAME'] = $database_name;
if ($force_stats) {
include_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.inc.php';
$databases[$database_name]['DEFAULT_COLLATION_NAME']
= PMA_getDbCollation($database_name);

2
libraries/display_create_database.lib.php
View File

@ -27,7 +27,7 @@ if ($is_create_db_priv) {
<input type="hidden" name="reload" value="1" />
<input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
<?php
include_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.inc.php';
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, true, 5);
if (! empty($dbstats)) {

2
libraries/display_structure.lib.php
View File

@ -7,7 +7,7 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/structure.lib.php';
require_once 'libraries/index.lib.php';
require_once 'libraries/tbl_info.inc.php';

114
libraries/mysql_charsets.inc.php Normal file
View File

@ -0,0 +1,114 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
if (! PMA_Util::cacheExists('mysql_charsets', true)) {
global $mysql_charsets, $mysql_charsets_descriptions,
$mysql_charsets_available, $mysql_collations, $mysql_collations_available,
$mysql_default_collations, $mysql_collations_flat;
$sql = PMA_DRIZZLE
? 'SELECT * FROM data_dictionary.CHARACTER_SETS'
: 'SELECT * FROM information_schema.CHARACTER_SETS';
$res = $GLOBALS['dbi']->query($sql);
$mysql_charsets = array();
while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
$mysql_charsets[] = $row['CHARACTER_SET_NAME'];
// never used
//$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen'];
$mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']]
= $row['DESCRIPTION'];
}
$GLOBALS['dbi']->freeResult($res);
sort($mysql_charsets, SORT_STRING);
$mysql_collations = array_flip($mysql_charsets);
$mysql_default_collations = $mysql_collations_flat
= $mysql_charsets_available = $mysql_collations_available = array();
$sql = PMA_DRIZZLE
? 'SELECT * FROM data_dictionary.COLLATIONS'
: 'SELECT * FROM information_schema.COLLATIONS';
$res = $GLOBALS['dbi']->query($sql);
while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
$mysql_collations[$row['CHARACTER_SET_NAME']]
= array($row['COLLATION_NAME']);
} else {
$mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME'];
}
$mysql_collations_flat[] = $row['COLLATION_NAME'];
if ($row['IS_DEFAULT'] == 'Yes' || $row['IS_DEFAULT'] == '1') {
$mysql_default_collations[$row['CHARACTER_SET_NAME']]
= $row['COLLATION_NAME'];
}
//$mysql_collations_available[$row['Collation']]
// = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
$mysql_collations_available[$row['COLLATION_NAME']] = true;
$mysql_charsets_available[$row['CHARACTER_SET_NAME']]
= !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])
|| !empty($mysql_collations_available[$row['COLLATION_NAME']]);
}
$GLOBALS['dbi']->freeResult($res);
unset($res, $row);
if (PMA_DRIZZLE
&& isset($mysql_collations['utf8_general_ci'])
&& isset($mysql_collations['utf8'])
) {
$mysql_collations['utf8'] = $mysql_collations['utf8_general_ci'];
$mysql_default_collations['utf8']
= $mysql_default_collations['utf8_general_ci'];
$mysql_charsets_available['utf8']
= $mysql_charsets_available['utf8_general_ci'];
unset(
$mysql_collations['utf8_general_ci'],
$mysql_default_collations['utf8_general_ci'],
$mysql_charsets_available['utf8_general_ci']
);
}
sort($mysql_collations_flat, SORT_STRING);
foreach ($mysql_collations as $key => $value) {
sort($mysql_collations[$key], SORT_STRING);
reset($mysql_collations[$key]);
}
unset($key, $value);
PMA_Util::cacheSet('mysql_charsets', $GLOBALS['mysql_charsets'], true);
PMA_Util::cacheSet('mysql_charsets_descriptions', $GLOBALS['mysql_charsets_descriptions'], true);
PMA_Util::cacheSet('mysql_charsets_available', $GLOBALS['mysql_charsets_available'], true);
PMA_Util::cacheSet('mysql_collations', $GLOBALS['mysql_collations'], true);
PMA_Util::cacheSet('mysql_default_collations', $GLOBALS['mysql_default_collations'], true);
PMA_Util::cacheSet('mysql_collations_flat', $GLOBALS['mysql_collations_flat'], true);
PMA_Util::cacheSet('mysql_collations_available', $GLOBALS['mysql_collations_available'], true);
} else {
$GLOBALS['mysql_charsets'] = PMA_Util::cacheGet('mysql_charsets', true);
$GLOBALS['mysql_charsets_descriptions'] = PMA_Util::cacheGet('mysql_charsets_descriptions', true);
$GLOBALS['mysql_charsets_available'] = PMA_Util::cacheGet('mysql_charsets_available', true);
$GLOBALS['mysql_collations'] = PMA_Util::cacheGet('mysql_collations', true);
$GLOBALS['mysql_default_collations'] = PMA_Util::cacheGet('mysql_default_collations', true);
$GLOBALS['mysql_collations_flat'] = PMA_Util::cacheGet('mysql_collations_flat', true);
$GLOBALS['mysql_collations_available'] = PMA_Util::cacheGet('mysql_collations_available', true);
}
define('PMA_CSDROPDOWN_COLLATION', 0);
define('PMA_CSDROPDOWN_CHARSET', 1);
/**
* shared functions for mysql charsets
*/
require_once './libraries/mysql_charsets.lib.php';
?>

100
libraries/mysql_charsets.lib.php
View File

@ -1,6 +1,8 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Shared code for mysql charsets
*
*
* @package PhpMyAdmin
*/
@ -8,104 +10,6 @@ if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
if (! PMA_Util::cacheExists('mysql_charsets', true)) {
global $mysql_charsets, $mysql_charsets_descriptions,
$mysql_charsets_available, $mysql_collations, $mysql_collations_available,
$mysql_default_collations, $mysql_collations_flat;
$sql = PMA_DRIZZLE
? 'SELECT * FROM data_dictionary.CHARACTER_SETS'
: 'SELECT * FROM information_schema.CHARACTER_SETS';
$res = $GLOBALS['dbi']->query($sql);
$mysql_charsets = array();
while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
$mysql_charsets[] = $row['CHARACTER_SET_NAME'];
// never used
//$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen'];
$mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']]
= $row['DESCRIPTION'];
}
$GLOBALS['dbi']->freeResult($res);
sort($mysql_charsets, SORT_STRING);
$mysql_collations = array_flip($mysql_charsets);
$mysql_default_collations = $mysql_collations_flat
= $mysql_charsets_available = $mysql_collations_available = array();
$sql = PMA_DRIZZLE
? 'SELECT * FROM data_dictionary.COLLATIONS'
: 'SELECT * FROM information_schema.COLLATIONS';
$res = $GLOBALS['dbi']->query($sql);
while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
$mysql_collations[$row['CHARACTER_SET_NAME']]
= array($row['COLLATION_NAME']);
} else {
$mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME'];
}
$mysql_collations_flat[] = $row['COLLATION_NAME'];
if ($row['IS_DEFAULT'] == 'Yes' || $row['IS_DEFAULT'] == '1') {
$mysql_default_collations[$row['CHARACTER_SET_NAME']]
= $row['COLLATION_NAME'];
}
//$mysql_collations_available[$row['Collation']]
// = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
$mysql_collations_available[$row['COLLATION_NAME']] = true;
$mysql_charsets_available[$row['CHARACTER_SET_NAME']]
= !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])
|| !empty($mysql_collations_available[$row['COLLATION_NAME']]);
}
$GLOBALS['dbi']->freeResult($res);
unset($res, $row);
if (PMA_DRIZZLE
&& isset($mysql_collations['utf8_general_ci'])
&& isset($mysql_collations['utf8'])
) {
$mysql_collations['utf8'] = $mysql_collations['utf8_general_ci'];
$mysql_default_collations['utf8']
= $mysql_default_collations['utf8_general_ci'];
$mysql_charsets_available['utf8']
= $mysql_charsets_available['utf8_general_ci'];
unset(
$mysql_collations['utf8_general_ci'],
$mysql_default_collations['utf8_general_ci'],
$mysql_charsets_available['utf8_general_ci']
);
}
sort($mysql_collations_flat, SORT_STRING);
foreach ($mysql_collations as $key => $value) {
sort($mysql_collations[$key], SORT_STRING);
reset($mysql_collations[$key]);
}
unset($key, $value);
PMA_Util::cacheSet('mysql_charsets', $GLOBALS['mysql_charsets'], true);
PMA_Util::cacheSet('mysql_charsets_descriptions', $GLOBALS['mysql_charsets_descriptions'], true);
PMA_Util::cacheSet('mysql_charsets_available', $GLOBALS['mysql_charsets_available'], true);
PMA_Util::cacheSet('mysql_collations', $GLOBALS['mysql_collations'], true);
PMA_Util::cacheSet('mysql_default_collations', $GLOBALS['mysql_default_collations'], true);
PMA_Util::cacheSet('mysql_collations_flat', $GLOBALS['mysql_collations_flat'], true);
PMA_Util::cacheSet('mysql_collations_available', $GLOBALS['mysql_collations_available'], true);
} else {
$GLOBALS['mysql_charsets'] = PMA_Util::cacheGet('mysql_charsets', true);
$GLOBALS['mysql_charsets_descriptions'] = PMA_Util::cacheGet('mysql_charsets_descriptions', true);
$GLOBALS['mysql_charsets_available'] = PMA_Util::cacheGet('mysql_charsets_available', true);
$GLOBALS['mysql_collations'] = PMA_Util::cacheGet('mysql_collations', true);
$GLOBALS['mysql_default_collations'] = PMA_Util::cacheGet('mysql_default_collations', true);
$GLOBALS['mysql_collations_flat'] = PMA_Util::cacheGet('mysql_collations_flat', true);
$GLOBALS['mysql_collations_available'] = PMA_Util::cacheGet('mysql_collations_available', true);
}
define('PMA_CSDROPDOWN_COLLATION', 0);
define('PMA_CSDROPDOWN_CHARSET', 1);
function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
$name = null, $id = null, $default = null, $label = true, $indent = 0,
$submitOnChange = false, $displayUnavailable = false

119
libraries/server_collations.lib.php Normal file
View File

@ -0,0 +1,119 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* functions for displaying server Character Sets and Collations
*
* @usedby server_collations.php
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Returns the html for server Character Sets and Collations.
*
* @param Array $mysql_charsets Mysql Charsets list
*
* @param Array $mysql_collations Mysql Collations list
*
* @param Array $mysql_charsets_descriptions Charsets descriptions
*
* @param Array $mysql_default_collations Default Collations list
*
* @param Array $mysql_collations_available Available Collations list
*
* @return string
*/
function PMA_getHtmlForCharsets($mysql_charsets, $mysql_collations,
$mysql_charsets_descriptions, $mysql_default_collations,
$mysql_collations_available)
{
/**
* Outputs the result
*/
$html = '<div id="div_mysql_charset_collations">' . "\n"
. '<table class="data noclick">' . "\n"
. '<tr><th>' . __('Collation') . '</th>' . "\n"
. ' <th>' . __('Description') . '</th>' . "\n"
. '</tr>' . "\n";
$i = 0;
$table_row_count = count($mysql_charsets) + count($mysql_collations);
foreach ($mysql_charsets as $current_charset) {
if ($i >= $table_row_count / 2) {
$i = 0;
$html .= '</table>' . "\n"
. '<table class="data noclick">' . "\n"
. '<tr><th>' . __('Collation') . '</th>' . "\n"
. ' <th>' . __('Description') . '</th>' . "\n"
. '</tr>' . "\n";
}
$i++;
$html .= '<tr><th colspan="2" class="right">' . "\n"
. ' ' . htmlspecialchars($current_charset) . "\n"
. (empty($mysql_charsets_descriptions[$current_charset])
? ''
: ' (<i>' . htmlspecialchars(
$mysql_charsets_descriptions[$current_charset]
) . '</i>)' . "\n")
. ' </th>' . "\n"
. '</tr>' . "\n";
$html .= PMA_getHtmlForCollationCurrentCharset(
$current_charset,
$mysql_collations,
$i,
$mysql_default_collations,
$mysql_collations_available
);
}
unset($table_row_count);
$html .= '</table>' . "\n"
. '</div>' . "\n";
return $html;
}
/**
* Returns the html for Collations of Current Charset.
*
* @param String $current_charset Current Charset
*
* @param Array $mysql_collations Collations list
*
* @param Array $mysql_default_collations Default Collations list
*
* @param Array $mysql_collations_available Available Collations list
*
* @param int $i Display Index
*
* @return string
*/
function PMA_getHtmlForCollationCurrentCharset($current_charset, $mysql_collations, &$i,
$mysql_default_collations, $mysql_collations_available)
{
$odd_row = true;
$html = '';
foreach ($mysql_collations[$current_charset] as $current_collation) {
$i++;
$html .= '<tr class="'
. ($odd_row ? 'odd' : 'even')
. ($mysql_default_collations[$current_charset] == $current_collation
? ' marked'
: '')
. ($mysql_collations_available[$current_collation] ? '' : ' disabled')
. '">' . "\n"
. ' <td>' . htmlspecialchars($current_collation) . '</td>' . "\n"
. ' <td>' . PMA_getCollationDescr($current_collation) . '</td>' . "\n"
. '</tr>' . "\n";
$odd_row = !$odd_row;
}
return $html;
}
?>

3
libraries/server_common.lib.php
View File

@ -26,6 +26,9 @@ function PMA_getSubPageHeader($type)
$res['binlog']['icon'] = 's_tbl.png';
$res['binlog']['text'] = __('Binary log');
$res['collations']['icon'] = 's_asci.png';
$res['collations']['text'] = __('Character Sets and Collations');
$html = '<h2>' . "\n"
. PMA_Util::getImage($res[$type]['icon'])
. ' ' . $res[$type]['text'] . "\n"

2
libraries/sqlparser.lib.php
View File

@ -44,7 +44,7 @@ require_once './libraries/sqlparser.data.php';
* Charset information
*/
if (!defined('TESTSUITE')) {
include_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.inc.php';
}
if (! isset($mysql_charsets)) {
$mysql_charsets = array();

2
libraries/tbl_columns_definition_form.inc.php
View File

@ -19,7 +19,7 @@ PMA_Util::checkParameters(array('db', 'table', 'action', 'num_fields'));
// Get available character sets and storage engines
require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/mysql_charsets.inc.php';
require_once './libraries/StorageEngine.class.php';
/**

76
server_collations.php
View File

@ -13,75 +13,27 @@ require_once 'libraries/common.inc.php';
/**
* Does the common work
*/
require 'libraries/server_common.inc.php';
require_once 'libraries/server_common.inc.php';
$response = PMA_Response::getInstance();
/**
* Displays the sub-page heading
*/
$html = '<h2>' . "\n"
. ' ' . PMA_Util::getImage('s_asci.png')
. '' . __('Character Sets and Collations') . "\n"
. '</h2>' . "\n";
require_once 'libraries/server_collations.lib.php';
/**
* Includes the required charset library
*/
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
$response = PMA_Response::getInstance();
/**
* Outputs the result
*/
$html .= '<div id="div_mysql_charset_collations">' . "\n"
. '<table class="data noclick">' . "\n"
. '<tr><th>' . __('Collation') . '</th>' . "\n"
. ' <th>' . __('Description') . '</th>' . "\n"
. '</tr>' . "\n";
$response->addHTML(PMA_getSubPageHeader('collations'));
$response->addHTML(PMA_getHtmlForCharsets(
$mysql_charsets,
$mysql_collations,
$mysql_charsets_descriptions,
$mysql_default_collations,
$mysql_collations_available
)
);
$i = 0;
$table_row_count = count($mysql_charsets) + count($mysql_collations);
foreach ($mysql_charsets as $current_charset) {
if ($i >= $table_row_count / 2) {
$i = 0;
$html .= '</table>' . "\n"
. '<table class="data noclick">' . "\n"
. '<tr><th>' . __('Collation') . '</th>' . "\n"
. ' <th>' . __('Description') . '</th>' . "\n"
. '</tr>' . "\n";
}
$i++;
$html .= '<tr><th colspan="2" class="right">' . "\n"
. ' ' . htmlspecialchars($current_charset) . "\n"
. (empty($mysql_charsets_descriptions[$current_charset])
? ''
: ' (<i>' . htmlspecialchars(
$mysql_charsets_descriptions[$current_charset]
) . '</i>)' . "\n")
. ' </th>' . "\n"
. '</tr>' . "\n";
$odd_row = true;
foreach ($mysql_collations[$current_charset] as $current_collation) {
$i++;
$html .= '<tr class="'
. ($odd_row ? 'odd' : 'even')
. ($mysql_default_collations[$current_charset] == $current_collation
? ' marked'
: '')
. ($mysql_collations_available[$current_collation] ? '' : ' disabled')
. '">' . "\n"
. ' <td>' . htmlspecialchars($current_collation) . '</td>' . "\n"
. ' <td>' . PMA_getCollationDescr($current_collation) . '</td>' . "\n"
. '</tr>' . "\n";
$odd_row = !$odd_row;
}
}
unset($table_row_count);
$html .= '</table>' . "\n"
. '</div>' . "\n";
$response->addHTML($html);
exit;
?>

2
tbl_operations.php
View File

@ -33,7 +33,7 @@ $cfgRelation = PMA_getRelationsParam();
/**
* Gets available MySQL charsets and storage engines
*/
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/StorageEngine.class.php';
/**

2
tbl_row_action.php
View File

@ -10,7 +10,7 @@
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* No rows were selected => show again the query and tell that user.

2
tbl_select.php
View File

@ -13,7 +13,7 @@
* Gets some core libraries
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/TableSearch.class.php';
$response = PMA_Response::getInstance();

2
tbl_structure.php
View File

@ -11,7 +11,7 @@
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* Function implementations for this script

2
tbl_zoom_select.php
View File

@ -12,7 +12,7 @@
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/mysql_charsets.inc.php';
require_once './libraries/TableSearch.class.php';
require_once './libraries/tbl_info.inc.php';

2
test/libraries/PMA_build_html_for_db_test.php
View File

@ -19,7 +19,7 @@ require_once 'libraries/Theme.class.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/Tracker.class.php';
require_once 'libraries/Types.class.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
{

2
test/libraries/PMA_operations_test.php
View File

@ -19,7 +19,7 @@ require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/Tracker.class.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* tests for operations

2
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -13,7 +13,7 @@ require_once './libraries/Types.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/Tracker.class.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/*
* Include to test.
*/