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:
J.M 2014-01-02 20:54:28 +01:00
commit 05d2d4839c
14 changed files with 101 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.2.0.0 (not yet released)
+ rfe #1662 Add table comment tool tip in database structure page
+ rfe #1447 Single table for display Character Sets and Collations
+ rfe #1455 Display icons/text/both for the table row actions
+ rfe #1473 Transformation to convert Boolean value to text
@ -15,6 +16,8 @@ phpMyAdmin - ChangeLog
4.1.4.0 (not yet released)
- bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
- bug #4209 Missing compression in one case
- bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-'
4.1.3.0 (2013-12-31)
- bug #3938 PDFDefaultPageSize doc and easy configurability

15
libraries/config/ServerConfigChecks.class.php
View File

@ -140,8 +140,10 @@ class ServerConfigChecks
$cookieAuthUsed, $blowfishSecret, $sServerAuthCfgMsg,
$sSecurityInfoMsg, $blowfishSecretSet
) {
for ($i = 1, $serverCnt = $this->cfg->getServerCount(); $i <= $serverCnt; $i++) {
$cookieAuthServer = ($this->cfg->getValue("Servers/$i/auth_type") == 'cookie');
$serverCnt = $this->cfg->getServerCount();
for ($i = 1; $i <= $serverCnt; $i++) {
$cookieAuthServer
= ($this->cfg->getValue("Servers/$i/auth_type") == 'cookie');
$cookieAuthUsed |= $cookieAuthServer;
$serverName = $this->performConfigChecksServersGetServerName(
$this->cfg->getServerName($i), $i
@ -472,7 +474,8 @@ class ServerConfigChecks
// $cfg['LoginCookieValidity']
// value greater than session.gc_maxlifetime will cause
// random session invalidation after that time
if ($this->cfg->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')
$loginCookieValidity = $this->cfg->getValue('LoginCookieValidity');
if ($loginCookieValidity > ini_get('session.gc_maxlifetime')
) {
PMA_messagesSet(
'error',
@ -486,7 +489,7 @@ class ServerConfigChecks
// $cfg['LoginCookieValidity']
// should be at most 1800 (30 min)
//
if ($this->cfg->getValue('LoginCookieValidity') > 1800) {
if ($loginCookieValidity > 1800) {
PMA_messagesSet(
'notice',
'LoginCookieValidity',
@ -500,8 +503,8 @@ class ServerConfigChecks
// $cfg['LoginCookieStore']
// LoginCookieValidity must be less or equal to LoginCookieStore
//
if ($this->cfg->getValue('LoginCookieStore') != 0
&& $this->cfg->getValue('LoginCookieValidity') > $this->cfg->getValue('LoginCookieStore')
if (($this->cfg->getValue('LoginCookieStore') != 0)
&& ($loginCookieValidity > $this->cfg->getValue('LoginCookieStore'))
) {
PMA_messagesSet(
'error',

12
libraries/export.lib.php
View File

@ -45,9 +45,17 @@ function PMA_isGzHandlerEnabled()
*/
function PMA_gzencodeNeeded()
{
/*
* We should gzencode only if the function exists
* but we don't want to compress twice, therefore
* gzencode only if transparent compression is not enabled
* and gz compression was not asked via $cfg['OBGzip']
* but transparent compression does not apply when saving to server
*/
if (@function_exists('gzencode')
&& ! @ini_get('zlib.output_compression')
&& ! PMA_isGzHandlerEnabled()
&& ((! @ini_get('zlib.output_compression')
&& ! PMA_isGzHandlerEnabled())
|| $GLOBALS['save_on_server'])
) {
return true;
} else {

12
libraries/pmd_common.php
View File

@ -180,9 +180,9 @@ function PMA_getScriptContr()
*
* @return array unique or primary indices
*/
function get_pk_or_unique_keys()
function PMA_getPKOrUniqueKeys()
{
return get_all_keys(true);
return PMA_getAllKeys(true);
}
/**
@ -192,7 +192,7 @@ function get_pk_or_unique_keys()
*
* @return array indices
*/
function get_all_keys($unique_only = false)
function PMA_getAllKeys($unique_only = false)
{
include_once './libraries/Index.class.php';
@ -219,7 +219,7 @@ function get_all_keys($unique_only = false)
*
* @return string
*/
function get_script_tabs()
function PMA_getScriptTabs()
{
$retval = array(
'j_tabs' => array(),
@ -242,7 +242,7 @@ function get_script_tabs()
*
* @return array table positions and sizes
*/
function get_tab_pos()
function PMA_getTabPos()
{
$cfgRelation = PMA_getRelationsParam();
@ -276,7 +276,7 @@ function get_tab_pos()
*
* @return void
*/
function PMD_Return_upd($b, $ret)
function PMA_returnUpd($b, $ret)
{
// not sure where this was defined...
global $K;

52
libraries/server_privileges.lib.php
View File

@ -411,7 +411,7 @@ function PMA_getGrantsArray()
*
* @return string $html_output html snippet
*/
function PMA_getHtmlForDisplayColumnPrivileges($columns, $row, $name_for_select,
function PMA_getHtmlForColumnPrivileges($columns, $row, $name_for_select,
$priv_for_header, $name, $name_for_dfn, $name_for_current
) {
$html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
@ -698,7 +698,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*',
*
* @return string html snippet
*/
function PMA_getHtmlForDisplayResourceLimits($row)
function PMA_getHtmlForResourceLimits($row)
{
$html_output = '<fieldset>' . "\n"
. '<legend>' . __('Resource limits') . '</legend>' . "\n"
@ -856,22 +856,22 @@ function PMA_getHtmlForTableSpecificPrivileges(
*/
function PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row)
{
$html_output = PMA_getHtmlForDisplayColumnPrivileges(
$html_output = PMA_getHtmlForColumnPrivileges(
$columns, $row, 'Select_priv', 'SELECT',
'select', __('Allows reading data.'), 'Select'
);
$html_output .= PMA_getHtmlForDisplayColumnPrivileges(
$html_output .= PMA_getHtmlForColumnPrivileges(
$columns, $row, 'Insert_priv', 'INSERT',
'insert', __('Allows inserting and replacing data.'), 'Insert'
);
$html_output .= PMA_getHtmlForDisplayColumnPrivileges(
$html_output .= PMA_getHtmlForColumnPrivileges(
$columns, $row, 'Update_priv', 'UPDATE',
'update', __('Allows changing data.'), 'Update'
);
$html_output .= PMA_getHtmlForDisplayColumnPrivileges(
$html_output .= PMA_getHtmlForColumnPrivileges(
$columns, $row, 'References_priv', 'REFERENCES', 'references',
__('Has no effect in this MySQL version.'), 'References'
);
@ -1016,7 +1016,7 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row)
// The "Resource limits" box is not displayed for db-specific privs
if ($db == '*') {
$html_output .= PMA_getHtmlForDisplayResourceLimits($row);
$html_output .= PMA_getHtmlForResourceLimits($row);
}
// for Safari 2.0.2
$html_output .= '<div class="clearfloat"></div>';
@ -1245,7 +1245,7 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes(
*
* @return string $html_output a HTML snippet
*/
function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
function PMA_getHtmlForLoginInformationFields($mode = 'new')
{
list($username_length, $hostname_length) = PMA_getUsernameAndHostnameLength();
@ -1681,7 +1681,7 @@ function PMA_getHtmlForAddUser($dbname)
. '<form name="usersForm" class="ajax" id="addUsersForm"'
. ' action="server_privileges.php" method="post" autocomplete="off" >' . "\n"
. PMA_URL_getHiddenInputs('', '')
. PMA_getHtmlForDisplayLoginInformationFields('new');
. PMA_getHtmlForLoginInformationFields('new');
$html_output .= '<fieldset id="fieldset_add_user_database">' . "\n"
. '<legend>' . __('Database for user') . '</legend>' . "\n";
@ -2470,7 +2470,7 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
. '<fieldset id="fieldset_change_copy_user">' . "\n"
. '<legend>' . __('Change Login Information / Copy User')
. '</legend>' . "\n"
. PMA_getHtmlForDisplayLoginInformationFields('change');
. PMA_getHtmlForLoginInformationFields('change');
$html_output .= '<fieldset id="fieldset_mode">' . "\n"
. ' <legend>'
@ -2648,7 +2648,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
*
* @return array $found_rows, $html_output
*/
function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $dbname,
function PMA_getHtmlForUserRights($db_rights, $dbname,
$hostname, $username
) {
$html_output = '';
@ -2728,7 +2728,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $dbname,
*
* @return array $html_output, $found_rows
*/
function PMA_getTableForDisplayAllTableSpecificRights(
function PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, $dbname
) {
// table header
@ -2782,7 +2782,7 @@ function PMA_getTableForDisplayAllTableSpecificRights(
$html_output .= '<tbody>' . "\n";
// display rows
list ($found_rows, $html_out) = PMA_getHtmlForDisplayUserRightsInRows(
list ($found_rows, $html_out) = PMA_getHtmlForUserRights(
$db_rights, $dbname, $hostname, $username
);
@ -2800,7 +2800,7 @@ function PMA_getTableForDisplayAllTableSpecificRights(
*
* @return string HTML snippet
*/
function PMA_getHtmlForDisplaySelectDbInEditPrivs($found_rows)
function PMA_getHtmlForSelectDbInEditPrivs($found_rows)
{
// we already have the list of databases from libraries/common.inc.php
// via $pma = new PMA;
@ -2941,7 +2941,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
. '</thead>' . "\n";
$html_output .= '<tbody>' . "\n";
$html_output .= PMA_getTableBodyForUserRightsTable($db_rights);
$html_output .= PMA_getHtmlTableBodyForUserRights($db_rights);
$html_output .= '</tbody>'
. '</table>' . "\n";
@ -2978,7 +2978,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
*
* @return string HTML snippet
*/
function PMA_getTableBodyForUserRightsTable($db_rights)
function PMA_getHtmlTableBodyForUserRights($db_rights)
{
if ($GLOBALS['cfgRelation']['menuswork']) {
$users_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
@ -3144,7 +3144,7 @@ function PMA_getFieldsetForAddDeleteUser()
*
* @return string HTML snippet
*/
function PMA_getHtmlForDisplayTheInitials($array_initials)
function PMA_getHtmlForInitials($array_initials)
{
// initialize to false the letters A-Z
for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
@ -3721,7 +3721,7 @@ function PMA_getAddUserHtmlFieldset()
*
* @return string $html_output
*/
function PMA_getHtmlHeaderForDisplayUserProperties(
function PMA_getHtmlHeaderForUserProperties(
$dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename
) {
$html_output = '<h2>' . "\n"
@ -3783,7 +3783,7 @@ function PMA_getHtmlHeaderForDisplayUserProperties(
*
* @return string $html_output
*/
function PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
{
$html_output = '<h2>' . "\n"
. PMA_Util::getIcon('b_usrlist.png')
@ -3808,7 +3808,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
$sql_query, null, PMA_DatabaseInterface::QUERY_STORE
);
$res_all = $GLOBALS['dbi']->tryQuery(
$sql_query_all, null, PMA_DatabaseInterface::QUERY_STORE
$sql_query_all, null, PMA_DatabaseInterface::QUERY_STORE
);
@ -3848,7 +3848,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
* Also not necessary if there is less than 20 privileges
*/
if ($GLOBALS['dbi']->numRows($res_all) > 20) {
$html_output .= PMA_getHtmlForDisplayTheInitials($array_initials);
$html_output .= PMA_getHtmlForInitials($array_initials);
}
/**
@ -3906,10 +3906,10 @@ function PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
*
* @return string $html_output
*/
function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
$username, $hostname, $dbname, $tablename
) {
$html_output = PMA_getHtmlHeaderForDisplayUserProperties(
$html_output = PMA_getHtmlHeaderForUserProperties(
$dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename
);
@ -3923,7 +3923,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
$html_output .= PMA_Message::error(
__('The selected user was not found in the privilege table.')
)->getDisplay();
$html_output .= PMA_getHtmlForDisplayLoginInformationFields();
$html_output .= PMA_getHtmlForLoginInformationFields();
//exit;
}
@ -3960,14 +3960,14 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
// unescape wildcards in dbname at table level
$unescaped_db = PMA_Util::unescapeMysqlWildcards($dbname);
list($html_rightsTable, $found_rows)
= PMA_getTableForDisplayAllTableSpecificRights(
= PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, $unescaped_db
);
$html_output .= $html_rightsTable;
if (! strlen($dbname)) {
// no database name was given, display select db
$html_output .= PMA_getHtmlForDisplaySelectDbInEditPrivs($found_rows);
$html_output .= PMA_getHtmlForSelectDbInEditPrivs($found_rows);
} else {
$html_output .= PMA_displayTablesInEditPrivs($dbname, $found_rows);

9
libraries/sql.lib.php
View File

@ -230,10 +230,11 @@ function PMA_handleSortOrder($db, $table, &$analyzed_sql_results, &$full_sql_que
if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) {
$sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
if ($sorted_col) {
//remove the backquoting and tablename from retrieved preference
//to get just column name
$sorted_col = str_replace('`', '', $sorted_col);
$sorted_col = str_replace($table . '.', '', $sorted_col);
//remove the tablename from retrieved preference
//to get just the column name and the sort order
$sorted_col = str_replace(
PMA_Util::backquote($table) . '.', '', $sorted_col
);
// retrieve the remembered sorting order for current table
$sql_order_to_append = ' ORDER BY ' . $sorted_col . ' ';
$full_sql_query

3
libraries/structure.lib.php
View File

@ -52,7 +52,8 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
}
$search_table .= '</a>';
$browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">'
$browse_table_label = '<a href="sql.php?' . $tbl_url_query
. '&amp;pos=0" title="' . $current_table['TABLE_COMMENT'] . '">'
. $truename . '</a>';
if (!$db_is_information_schema) {

8
pmd_general.php
View File

@ -14,11 +14,11 @@ require_once 'libraries/pmd_common.php';
$script_display_field = PMA_getTablesInfo();
$tab_column = PMA_getColumnsInfo();
$script_tables = get_script_tabs();
$script_tables = PMA_getScriptTabs();
$script_contr = PMA_getScriptContr();
$tab_pos = get_tab_pos();
$tables_pk_or_unique_keys = get_pk_or_unique_keys();
$tables_all_keys = get_all_keys();
$tab_pos = PMA_getTabPos();
$tables_pk_or_unique_keys = PMA_getPKOrUniqueKeys();
$tables_all_keys = PMA_getAllKeys();
$params = array('lang' => $GLOBALS['lang']);
if (isset($_GET['db'])) {

2
pmd_relation_upd.php
View File

@ -64,6 +64,6 @@ if ($try_to_delete_internal_relation) {
PMA_DatabaseInterface::QUERY_STORE
);
}
PMD_Return_upd(1, __('Relation deleted'));
PMA_returnUpd(1, __('Relation deleted'));
?>

12
po/sl.po
View File

@ -4,10 +4,10 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.2.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-12-27 18:16-0500\n"
"PO-Revision-Date: 2013-12-20 22:54+0200\n"
"PO-Revision-Date: 2014-01-01 12:48+0200\n"
"Last-Translator: Domen <mitenem@outlook.com>\n"
"Language-Team: Slovenian <http://l10n.cihar.com/projects/phpmyadmin/master/"
"sl/>\n"
"Language-Team: Slovenian "
"<http://l10n.cihar.com/projects/phpmyadmin/master/sl/>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -7142,6 +7142,8 @@ msgid ""
"Skip this number of queries (for SQL) or lines (for other formats), starting "
"from the first one:"
msgstr ""
"Preskoči to število poizvedb (za SQL) ali vrstic (za druge oblike), začenši "
"s prvo:"
#: libraries/display_import.lib.php:341
msgid "Format-Specific Options:"
@ -9114,7 +9116,7 @@ msgstr "Hitri koraki za namestitev naprednih funkcij:"
#: libraries/relation.lib.php:289
msgid ""
"Create the needed tables with the <code>examples/create_tables.sql</code>."
msgstr "Ustvarite potrebne tabele s <code>examples/create_tables.sql</code>."
msgstr "Ustvarite potrebne tabele z <code>examples/create_tables.sql</code>."
#: libraries/relation.lib.php:295
msgid "Create a pma user and give access to these tables."
@ -12206,7 +12208,7 @@ msgstr "Časovnica"
#: libraries/tbl_chart.lib.php:64
msgctxt "Chart type"
msgid "Scatter"
msgstr ""
msgstr "Raztreseni"
#: libraries/tbl_chart.lib.php:82
msgid "Stacked"

12
po/zh_CN.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.2.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-12-27 18:16-0500\n"
"PO-Revision-Date: 2013-09-26 20:35+0200\n"
"Last-Translator: Hao Luo <haoluo.ca@gmail.com>\n"
"Language-Team: Simplified Chinese <http://l10n.cihar.com/projects/phpmyadmin/"
"master/zh_CN/>\n"
"PO-Revision-Date: 2014-01-01 09:31+0200\n"
"Last-Translator: zz zz <tczzjin@gmail.com>\n"
"Language-Team: Simplified Chinese "
"<http://l10n.cihar.com/projects/phpmyadmin/master/zh_CN/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 1.7-dev\n"
"X-Generator: Weblate 1.9-dev\n"
#: changelog.php:36 license.php:28
#, php-format
@ -411,7 +411,7 @@ msgstr ""
#: error_report.php:37 error_report.php:54 error_report.php:65
#: error_report.php:81
msgid "You may want to refresh the page."
msgstr ""
msgstr "您需要刷新当前页面。"
#: error_report.php:45
msgid ""

4
server_privileges.php
View File

@ -360,7 +360,7 @@ if (isset($_REQUEST['adduser'])) {
if (! isset($username)) {
// No username is given --> display the overview
$response->addHTML(
PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
);
} else {
// A user was selected -> display the user's properties
@ -375,7 +375,7 @@ if (isset($_REQUEST['adduser'])) {
)
);
$response->addHTML(
PMA_getHtmlForDisplayUserProperties(
PMA_getHtmlForUserProperties(
((isset ($dbname_is_wildcard)) ? $dbname_is_wildcard : ''),
$url_dbname, $username, $hostname,
(isset($dbname) ? $dbname : ''),

36
test/libraries/PMA_server_privileges_test.php
View File

@ -303,11 +303,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDisplayColumnPrivileges
* Test for PMA_getHtmlForColumnPrivileges
*
* @return void
*/
public function testPMAGetHtmlForDisplayColumnPrivileges()
public function testPMAGetHtmlForColumnPrivileges()
{
$columns = array(
'row1' => 'name1'
@ -321,7 +321,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$name_for_dfn = 'name_for_dfn';
$name_for_current = 'name_for_current';
$html = PMA_getHtmlForDisplayColumnPrivileges(
$html = PMA_getHtmlForColumnPrivileges(
$columns, $row, $name_for_select,
$priv_for_header, $name, $name_for_dfn, $name_for_current
);
@ -420,11 +420,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDisplayResourceLimits
* Test for PMA_getHtmlForResourceLimits
*
* @return void
*/
public function testPMAGetHtmlForDisplayResourceLimits()
public function testPMAGetHtmlForResourceLimits()
{
$row = array(
'max_questions' => 'max_questions',
@ -433,8 +433,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
'max_user_connections' => 'max_user_connections',
);
//PMA_getHtmlForDisplayResourceLimits
$html = PMA_getHtmlForDisplayResourceLimits($row);
//PMA_getHtmlForResourceLimits
$html = PMA_getHtmlForResourceLimits($row);
$this->assertContains(
'<legend>' . __('Resource limits') . '</legend>',
$html
@ -909,7 +909,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$html
);
//validate 5: PMA_getHtmlForDisplayResourceLimits
//validate 5: PMA_getHtmlForResourceLimits
$this->assertContains(
'<legend>' . __('Resource limits') . '</legend>',
$html
@ -1053,11 +1053,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDisplayLoginInformationFields
* Test for PMA_getHtmlForLoginInformationFields
*
* @return void
*/
public function testPMAGetHtmlForDisplayLoginInformationFields()
public function testPMAGetHtmlForLoginInformationFields()
{
$GLOBALS['username'] = 'pma_username';
@ -1081,7 +1081,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['dbi'] = $dbi;
$html = PMA_getHtmlForDisplayLoginInformationFields();
$html = PMA_getHtmlForLoginInformationFields();
list($username_length, $hostname_length)
= PMA_getUsernameAndHostnameLength();
@ -1200,9 +1200,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$html
);
//validate 2: PMA_getHtmlForDisplayLoginInformationFields
//validate 2: PMA_getHtmlForLoginInformationFields
$this->assertContains(
PMA_getHtmlForDisplayLoginInformationFields('new'),
PMA_getHtmlForLoginInformationFields('new'),
$html
);
@ -1669,9 +1669,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$html
);
//PMA_getHtmlForDisplayLoginInformationFields
//PMA_getHtmlForLoginInformationFields
$this->assertContains(
PMA_getHtmlForDisplayLoginInformationFields('change'),
PMA_getHtmlForLoginInformationFields('change'),
$html
);
@ -1930,11 +1930,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlHeaderForDisplayUserProperties
* Test for PMA_getHtmlHeaderForUserProperties
*
* @return void
*/
public function testPMAGetHtmlHeaderForDisplayUserProperties()
public function testPMAGetHtmlHeaderForUserProperties()
{
$dbname_is_wildcard = true;
$url_dbname = "url_dbname";
@ -1944,7 +1944,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$tablename = "tablename";
$_REQUEST['tablename'] = "tablename";
$html = PMA_getHtmlHeaderForDisplayUserProperties(
$html = PMA_getHtmlHeaderForUserProperties(
$dbname_is_wildcard, $url_dbname, $dbname,
$username, $hostname, $tablename
);

2
test/libraries/PMA_structure_test.php
View File

@ -70,6 +70,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$current_table = array(
'TABLE_ROWS' => 3,
'TABLE_NAME' => 'name1',
'TABLE_COMMENT' => 'This is a test comment'
);
$table_is_view = false;
$tbl_url_query = 'tbl_url_query';
@ -136,6 +137,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$current_table = array(
'TABLE_ROWS' => 0,
'TABLE_NAME' => 'name1',
'TABLE_COMMENT' => 'This is a test comment'
);
$table_is_view = false;
list(