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 2015-09-16 23:43:56 +02:00
commit 1665282cb8
9 changed files with 564 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

642
libraries/server_privileges.lib.php
View File

@ -959,6 +959,97 @@ function PMA_getHtmlForResourceLimits($row)
return $html_output;
}
/**
* Get the HTML snippet for routine specific privileges
*
* @param string $username username for database connection
* @param string $hostname hostname for database connection
* @param string $db the database
* @param string $routine the routine
* @param string $url_dbname url encoded db name
*
* @return string $html_output
*/
function PMA_getHtmlForRoutineSpecificPrivilges(
$username, $hostname, $db, $routine, $url_dbname
) {
$header = PMA_getHtmlHeaderForUserProperties(
false, $url_dbname, $db, $username, $hostname, $routine
);
$sql = "SELECT `Proc_priv`"
. " FROM `mysql`.`procs_priv`"
. " WHERE `User` = '" . PMA_Util::sqlAddSlashes($username) . "'"
. " AND `Host` = '" . PMA_Util::sqlAddSlashes($hostname) . "'"
. " AND `Db` = '"
. PMA_Util::sqlAddSlashes(PMA_Util::unescapeMysqlWildcards($db)) . "'"
. " AND `Routine_name` LIKE '" . PMA_Util::sqlAddSlashes($routine) . "';";
$res = $GLOBALS['dbi']->fetchValue($sql);
$privs = array(
'Alter_routine_priv' => 'N',
'Execute_priv' => 'N',
'Grant_priv' => 'N',
);
foreach (explode(',', $res) as $priv) {
if ($priv == 'Alter Routine') {
$privs['Alter_routine_priv'] = 'Y';
} else {
$privs[$priv . '_priv'] = 'Y';
}
}
$routineArray = array(PMA_getTriggerPrivilegeTable());
$privTableNames = array(__('Routine'));
$privCheckboxes = PMA_getHtmlForGlobalPrivTableWithCheckboxes(
$routineArray, $privTableNames, $privs
);
$data = array(
'username' => $username,
'hostname' => $hostname,
'database' => $db,
'routine' => $routine,
'grantCount' => count($privs),
'privCheckboxes' => $privCheckboxes,
'header' => $header,
);
$html_output = PMA\Template::get('privileges/edit_routine_privileges')
->render($data);
return $html_output;
}
/**
* Get routine privilege table as an array
*
* @return privilege type array
*/
function PMA_getTriggerPrivilegeTable()
{
$routinePrivTable = array(
array(
'Grant',
'GRANT',
__(
'Allows adding users and privileges '
. 'without reloading the privilege tables.'
)
),
array(
'Alter_routine',
'ALTER ROUTINE',
__('Allows altering and dropping this routine.')
),
array(
'Execute',
'EXECUTE',
__('Allows executing this routine.')
)
);
return $routinePrivTable;
}
/**
* Get the HTML snippet for table specific privileges
*
@ -1951,20 +2042,21 @@ function PMA_updatePassword($err_url, $username, $hostname)
* @param string $tablename table name
* @param string $username username
* @param string $hostname host name
* @param string $itemType item type
*
* @return array ($message, $sql_query)
*/
function PMA_getMessageAndSqlQueryForPrivilegesRevoke($dbname,
$tablename, $username, $hostname
$tablename, $username, $hostname, $itemType
) {
$db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
$sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
$sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $itemType . ' ' . $db_and_table
. ' FROM \''
. PMA_Util::sqlAddSlashes($username) . '\'@\''
. PMA_Util::sqlAddSlashes($hostname) . '\';';
$sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
$sql_query1 = 'REVOKE GRANT OPTION ON ' . $itemType . ' ' . $db_and_table
. ' FROM \'' . PMA_Util::sqlAddSlashes($username) . '\'@\''
. PMA_Util::sqlAddSlashes($hostname) . '\';';
@ -2583,17 +2675,19 @@ function PMA_getHtmlListOfPrivs(
/**
* Returns edit, revoke or export link for a user.
*
* @param string $linktype The link type (edit | revoke | export)
* @param string $username User name
* @param string $hostname Host name
* @param string $dbname Database name
* @param string $tablename Table name
* @param string $initial Initial value
* @param string $linktype The link type (edit | revoke | export)
* @param string $username User name
* @param string $hostname Host name
* @param string $dbname Database name
* @param string $tablename Table name
* @param string $routinename Routine name
* @param string $initial Initial value
*
* @return string HTML code with link
*/
function PMA_getUserLink(
$linktype, $username, $hostname, $dbname = '', $tablename = '', $initial = ''
$linktype, $username, $hostname, $dbname = '',
$tablename = '', $routinename = '', $initial = ''
) {
$html = '<a';
switch($linktype) {
@ -2612,10 +2706,12 @@ function PMA_getUserLink(
case 'edit':
$params['dbname'] = $dbname;
$params['tablename'] = $tablename;
$params['routinename'] = $routinename;
break;
case 'revoke':
$params['dbname'] = $dbname;
$params['tablename'] = $tablename;
$params['routinename'] = $routinename;
$params['revokeall'] = 1;
break;
case 'export':
@ -2777,6 +2873,7 @@ function PMA_getExtraDataForAjaxBehavior(
$hostname,
'',
'',
'',
isset($_GET['initial']) ? $_GET['initial'] : ''
)
. '</td>' . "\n";
@ -2937,29 +3034,40 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
* db name was given, so we want all user specific rights for this db
* So this function returns user rights as an array
*
* @param array $tables tables
* @param string $user_host_condition a where clause that contained user's host
* condition
* @param string $dbname database name
* @param string $username username
* @param string $hostname host name
* @param string $type database or table
* @param string $dbname database name
*
* @return array $db_rights database rights
*/
function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
function PMA_getUserSpecificRights($username, $hostname, $type, $dbname = '')
{
if (!/*overload*/mb_strlen($dbname)) {
$user_host_condition = " WHERE `User`"
. " = '" . PMA_Util::sqlAddSlashes($username) . "'"
. " AND `Host`"
. " = '" . PMA_Util::sqlAddSlashes($hostname) . "'";
if ($type == 'database') {
$tables_to_search_for_users = array(
'tables_priv', 'columns_priv',
'tables_priv', 'columns_priv', 'procs_priv'
);
$dbOrTableName = 'Db';
} else {
$user_host_condition .=
' AND `Db`'
. ' LIKE \''
} elseif ($type == 'table') {
$user_host_condition .= " AND `Db` LIKE '"
. PMA_Util::sqlAddSlashes($dbname, true) . "'";
$tables_to_search_for_users = array('columns_priv',);
$dbOrTableName = 'Table_name';
} else { // routine
$user_host_condition .= " AND `Db` LIKE '"
. PMA_Util::sqlAddSlashes($dbname, true) . "'";
$tables_to_search_for_users = array('procs_priv',);
$dbOrTableName = 'Routine_name';
}
// we also want privileges for this user not in table `db` but in other table
$tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
$db_rights_sqls = array();
foreach ($tables_to_search_for_users as $table_search_in) {
if (in_array($table_search_in, $tables)) {
@ -2987,7 +3095,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
while ($db_rights_row = $GLOBALS['dbi']->fetchAssoc($db_rights_result)) {
$db_rights_row = array_merge($user_defaults, $db_rights_row);
if (!/*overload*/mb_strlen($dbname)) {
if ($type == 'database') {
// only Db names in the table `mysql`.`db` uses wildcards
// as we are in the db specific rights display we want
// all db names escaped, also from other sources
@ -3000,10 +3108,10 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$GLOBALS['dbi']->freeResult($db_rights_result);
if (!/*overload*/mb_strlen($dbname)) {
if ($type == 'database') {
$sql_query = 'SELECT * FROM `mysql`.`db`'
. $user_host_condition . ' ORDER BY `Db` ASC';
} else {
} elseif ($type == 'table') {
$sql_query = 'SELECT `Table_name`,'
. ' `Table_priv`,'
. ' IF(`Column_priv` = _latin1 \'\', 0, 1)'
@ -3011,6 +3119,12 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
. ' FROM `mysql`.`tables_priv`'
. $user_host_condition
. ' ORDER BY `Table_name` ASC;';
} else {
$sql_query = "SELECT `Routine_name`, `Proc_priv`"
. " FROM `mysql`.`procs_priv`"
. $user_host_condition
. " ORDER BY `Routine_name`";
}
$result = $GLOBALS['dbi']->query($sql_query);
@ -3022,7 +3136,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
} else {
$db_rights[$row[$dbOrTableName]] = $row;
}
if (!/*overload*/mb_strlen($dbname)) {
if ($type == 'database') {
// there are db specific rights for this user
// so we can drop this db rights
$db_rights[$row['Db']]['can_delete'] = true;
@ -3032,273 +3146,191 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
return $db_rights;
}
/**
* Display user rights in table rows(Table specific or database specific privs)
*
* @param array $db_rights user's database rights array
* @param string $dbname database name
* @param string $hostname host name
* @param string $username username
*
* @return array $found_rows, $html_output
*/
function PMA_getHtmlForUserRights($db_rights, $dbname,
$hostname, $username
) {
$html_output = '';
$found_rows = array();
// display rows
if (count($db_rights) < 1) {
$html_output .= '<tr class="odd">' . "\n"
. '<td colspan="6"><center><i>' . __('None') . '</i></center></td>' . "\n"
. '</tr>' . "\n";
return array($found_rows, $html_output);
}
$odd_row = true;
//while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
foreach ($db_rights as $row) {
$dbNameLength = /*overload*/mb_strlen($dbname);
$found_rows[] = (!$dbNameLength)
? $row['Db']
: $row['Table_name'];
$html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
. '<td>'
. htmlspecialchars(
(!$dbNameLength)
? $row['Db']
: $row['Table_name']
)
. '</td>' . "\n"
. '<td><code>' . "\n"
. ' '
. join(
',' . "\n" . ' ',
PMA_extractPrivInfo($row, true)
) . "\n"
. '</code></td>' . "\n"
. '<td>'
. ((((!$dbNameLength) && $row['Grant_priv'] == 'Y')
|| ($dbNameLength
&& in_array('Grant', explode(',', $row['Table_priv']))))
? __('Yes')
: __('No'))
. '</td>' . "\n"
. '<td>';
if (!empty($row['Table_privs']) || !empty($row['Column_priv'])) {
$html_output .= __('Yes');
} else {
$html_output .= __('No');
}
$html_output .= '</td>';
$html_output .= '<td>';
if ($GLOBALS['is_grantuser']) {
$html_output .= PMA_getUserLink(
'edit',
$username,
$hostname,
(!$dbNameLength) ? $row['Db'] : $dbname,
(!$dbNameLength) ? '' : $row['Table_name']
);
}
$html_output .= '</td>';
$html_output .= '<td>';
if (! empty($row['can_delete'])
|| isset($row['Table_name'])
&& /*overload*/mb_strlen($row['Table_name'])
) {
$html_output .= PMA_getUserLink(
'revoke',
$username,
$hostname,
(!$dbNameLength) ? $row['Db'] : $dbname,
(!$dbNameLength) ? '' : $row['Table_name']
);
}
$html_output .= '</td>' . "\n"
. '</tr>' . "\n";
$odd_row = ! $odd_row;
} // end while
return array($found_rows, $html_output);
}
/**
* Get a HTML table for display user's tabel specific or database specific rights
*
* @param string $username username
* @param string $hostname host name
* @param string $type database, table or routine
* @param string $dbname database name
*
* @return array $html_output, $found_rows
* @return array $html_output
*/
function PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, $dbname
$username, $hostname, $type, $dbname = ''
) {
// table header
$html_output = PMA_URL_getHiddenInputs('', '')
. '<input type="hidden" name="username" '
. 'value="' . htmlspecialchars($username) . '" />' . "\n"
. '<input type="hidden" name="hostname" '
. 'value="' . htmlspecialchars($hostname) . '" />' . "\n"
. '<fieldset>' . "\n"
. '<legend data-submenu-label="'
. (!/*overload*/mb_strlen($dbname)
? __('Database')
: __('Table')
)
. '">'
. (!/*overload*/mb_strlen($dbname)
? __('Database-specific privileges')
: __('Table-specific privileges')
)
. '</legend>' . "\n"
. '<table class="data">' . "\n"
. '<thead>' . "\n"
. '<tr><th>'
. (!/*overload*/mb_strlen($dbname) ? __('Database') : __('Table'))
. '</th>' . "\n"
. '<th>' . __('Privileges') . '</th>' . "\n"
. '<th>' . __('Grant') . '</th>' . "\n"
. '<th>'
. (!/*overload*/mb_strlen($dbname)
? __('Table-specific privileges')
: __('Column-specific privileges')
)
. '</th>' . "\n"
. '<th colspan="2">' . __('Action') . '</th>' . "\n"
. '</tr>' . "\n"
. '</thead>' . "\n";
$user_host_condition = ' WHERE `User`'
. ' = \'' . PMA_Util::sqlAddSlashes($username) . "'"
. ' AND `Host`'
. ' = \'' . PMA_Util::sqlAddSlashes($hostname) . "'";
// table body
// get data
// we also want privileges for this user not in table `db` but in other table
$tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
$uiData = array(
'database' => array(
'formId' => 'database_specific_priv',
'subMenuLabel' => __('Database'),
'legend' => __('Database-specific privileges'),
'typeLabel' => __('Database'),
),
'table' => array(
'formId' => 'table_specific_priv',
'subMenuLabel' => __('Table'),
'legend' => __('Table-specific privileges'),
'typeLabel' => __('Table'),
),
'routine' => array(
'formId' => 'routine_specific_priv',
'subMenuLabel' => __('Routine'),
'legend' => __('Routine-specific privileges'),
'typeLabel' => __('Routine'),
),
);
/**
* no db name given, so we want all privs for the given user
* db name was given, so we want all user specific rights for this db
*/
$db_rights = PMA_getUserSpecificRights($tables, $user_host_condition, $dbname);
$db_rights = PMA_getUserSpecificRights($username, $hostname, $type, $dbname);
ksort($db_rights);
$html_output .= '<tbody>' . "\n";
// display rows
list ($found_rows, $html_out) = PMA_getHtmlForUserRights(
$db_rights, $dbname, $hostname, $username
);
$foundRows = array();
$privileges = array();
foreach ($db_rights as $row) {
$onePrivilege = array();
$html_output .= $html_out;
$html_output .= '</tbody>' . "\n";
$html_output .='</table>' . "\n";
$paramDbName = '';
$paramTableName = '';
$paramRoutineName = '';
return array($html_output, $found_rows);
}
if ($type == 'database') {
$name = $row['Db'];
$onePrivilege['grant'] = $row['Grant_priv'] == 'Y';
$onePrivilege['tablePrivs'] = ! empty($row['Table_priv'])
|| ! empty($row['Column_priv']);
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
/**
* Get HTML for display select db
*
* @param array $found_rows isset($dbname)) ? $row['Db'] : $row['Table_name']
*
* @return string HTML snippet
*/
function PMA_getHtmlForSelectDbInEditPrivs($found_rows)
{
// we already have the list of databases from libraries/common.inc.php
// via $pma = new PMA;
$pred_db_array = $GLOBALS['pma']->databases;
$paramDbName = $row['Db'];
$databases_to_skip = array('information_schema', 'performance_schema');
} elseif ($type == 'table') {
$name = $row['Table_name'];
$onePrivilege['grant'] = in_array('Grant', explode(',', $row['Table_priv']));
$onePrivilege['columnPrivs'] = ! empty($row['Column_priv']);
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
$html_output = '<label for="text_dbname">'
. __('Add privileges on the following database(s):') . '</label>' . "\n";
if (! empty($pred_db_array)) {
$html_output .= '<select name="pred_dbname[]" multiple="multiple">' . "\n";
foreach ($pred_db_array as $current_db) {
if (in_array($current_db, $databases_to_skip)) {
continue;
$paramDbName = $dbname;
$paramTableName = $row['Table_name'];
} else { // routine
$name = $row['Routine_name'];
$onePrivilege['grant'] = in_array('Grant', explode(',', $row['Proc_priv']));
$privs = array(
'Alter_routine_priv' => 'N',
'Execute_priv' => 'N',
'Grant_priv' => 'N',
);
foreach (explode(',', $row['Proc_priv']) as $priv) {
if ($priv == 'Alter Routine') {
$privs['Alter_routine_priv'] = 'Y';
} else {
$privs[$priv . '_priv'] = 'Y';
}
}
$current_db_show = $current_db;
$current_db = PMA_Util::escapeMysqlWildcards($current_db);
// cannot use array_diff() once, outside of the loop,
// because the list of databases has special characters
// already escaped in $found_rows,
// contrary to the output of SHOW DATABASES
if (empty($found_rows) || ! in_array($current_db, $found_rows)) {
$html_output .= '<option value="'
. htmlspecialchars($current_db) . '">'
. htmlspecialchars($current_db_show) . '</option>' . "\n";
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($privs, true));
$paramDbName = $dbname;
$paramRoutineName = $row['Routine_name'];
}
$foundRows[] = $name;
$onePrivilege['name'] = $name;
$onePrivilege['editLink'] = '';
if ($GLOBALS['is_grantuser']) {
$onePrivilege['editLink'] = PMA_getUserLink(
'edit',
$username,
$hostname,
$paramDbName,
$paramTableName,
$paramRoutineName
);
}
$onePrivilege['revokeLink'] = '';
if ($type != 'database' || ! empty($row['can_delete'])) {
$onePrivilege['revokeLink'] = PMA_getUserLink(
'revoke',
$username,
$hostname,
$paramDbName,
$paramTableName,
$paramRoutineName
);
}
$privileges[] = $onePrivilege;
}
$data = $uiData[$type];
$data['privileges'] = $privileges;
$data['userName'] = $username;
$data['hostName'] = $hostname;
$data['database'] = $dbname;
$data['type'] = $type;
if ($type == 'database') {
// we already have the list of databases from libraries/common.inc.php
// via $pma = new PMA;
$pred_db_array = $GLOBALS['pma']->databases;
$databases_to_skip = array('information_schema', 'performance_schema');
$databases = array();
if (! empty($pred_db_array)) {
foreach ($pred_db_array as $current_db) {
if (in_array($current_db, $databases_to_skip)) {
continue;
}
$current_db_escaped = PMA_Util::escapeMysqlWildcards($current_db);
// cannot use array_diff() once, outside of the loop,
// because the list of databases has special characters
// already escaped in $foundRows,
// contrary to the output of SHOW DATABASES
if (! in_array($current_db_escaped, $foundRows)) {
$databases[] = $current_db;
}
}
}
$html_output .= '</select>' . "\n";
}
$html_output .= '<input type="text" id="text_dbname" name="dbname" />'
. "\n"
. PMA_Util::showHint(
__('Wildcards % and _ should be escaped with a \ to use them literally.')
$data['databases'] = $databases;
} elseif ($type == 'table') {
$result = @$GLOBALS['dbi']->tryQuery(
"SHOW TABLES FROM " . PMA_Util::backquote($dbname),
null,
PMA_DatabaseInterface::QUERY_STORE
);
return $html_output;
}
/**
* Get HTML for display table in edit privilege
*
* @param string $dbname database naame
* @param array $found_rows isset($dbname)) ? $row['Db'] : $row['Table_name']
*
* @return string HTML snippet
*/
function PMA_displayTablesInEditPrivs($dbname, $found_rows)
{
$html_output = '<input type="hidden" name="dbname"
' . 'value="' . htmlspecialchars($dbname) . '"/>' . "\n";
$html_output .= '<label for="text_tablename">'
. __('Add privileges on the following table:') . '</label>' . "\n";
$tables = array();
if ($result) {
while ($row = $GLOBALS['dbi']->fetchRow($result)) {
if (! in_array($row[0], $foundRows)) {
$tables[] = $row[0];
}
}
$GLOBALS['dbi']->freeResult($result);
}
$data['tables'] = $tables;
$result = @$GLOBALS['dbi']->tryQuery(
'SHOW TABLES FROM ' . PMA_Util::backquote(
PMA_Util::unescapeMysqlWildcards($dbname)
) . ';',
null,
PMA_DatabaseInterface::QUERY_STORE
);
} else { // routine
$routineData = $GLOBALS['dbi']->getRoutines($dbname);
if ($result) {
$pred_tbl_array = array();
while ($row = $GLOBALS['dbi']->fetchRow($result)) {
if (! isset($found_rows) || ! in_array($row[0], $found_rows)) {
$pred_tbl_array[] = $row[0];
$routines = array();
foreach ($routineData as $routine) {
if (! in_array($routine['name'], $foundRows)) {
$routines[] = $routine['name'];
}
}
$GLOBALS['dbi']->freeResult($result);
if (! empty($pred_tbl_array)) {
$html_output .= '<select name="pred_tablename" '
. 'class="autosubmit">' . "\n"
. '<option value="" selected="selected">' . __('Use text field')
. ':</option>' . "\n";
foreach ($pred_tbl_array as $current_table) {
$html_output .= '<option '
. 'value="' . htmlspecialchars($current_table) . '">'
. htmlspecialchars($current_table)
. '</option>' . "\n";
}
$html_output .= '</select>' . "\n";
}
$data['routines'] = $routines;
}
$html_output .= '<input type="text" id="text_tablename" name="tablename" />'
. "\n";
$html_output = PMA\Template::get('privileges/privileges_summary')
->render($data);
return $html_output;
}
@ -3505,6 +3537,7 @@ function PMA_getHtmlTableBodyForUserRights($db_rights)
$host['Host'],
'',
'',
'',
isset($_GET['initial']) ? $_GET['initial'] : ''
)
. '</td>';
@ -3726,19 +3759,20 @@ function PMA_deleteUser($queries)
* @param string $hostname host name
* @param string $tablename table name
* @param string $dbname database name
* @param strubg $itemType item type
*
* @return PMA_message success message or error message for update
*/
function PMA_updatePrivileges($username, $hostname, $tablename, $dbname)
function PMA_updatePrivileges($username, $hostname, $tablename, $dbname, $itemType)
{
$db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
$sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
$sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $itemType . ' ' . $db_and_table
. ' FROM \'' . PMA_Util::sqlAddSlashes($username)
. '\'@\'' . PMA_Util::sqlAddSlashes($hostname) . '\';';
if (! isset($_POST['Grant_priv']) || $_POST['Grant_priv'] != 'Y') {
$sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
$sql_query1 = 'REVOKE GRANT OPTION ON ' . $itemType . ' ' . $db_and_table
. ' FROM \'' . PMA_Util::sqlAddSlashes($username) . '\'@\''
. PMA_Util::sqlAddSlashes($hostname) . '\';';
} else {
@ -3751,7 +3785,7 @@ function PMA_updatePrivileges($username, $hostname, $tablename, $dbname)
&& 'USAGE' == implode('', PMA_extractPrivInfo()))
) {
$sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo())
. ' ON ' . $db_and_table
. ' ON ' . $itemType . ' ' . $db_and_table
. ' TO \'' . PMA_Util::sqlAddSlashes($username) . '\'@\''
. PMA_Util::sqlAddSlashes($hostname) . '\'';
@ -4135,6 +4169,7 @@ function PMA_getDataForDBInfo()
$hostname = null;
$dbname = null;
$tablename = null;
$routinename = null;
$dbname_is_wildcard = null;
if (isset($_REQUEST['username'])) {
@ -4154,6 +4189,14 @@ function PMA_getDataForDBInfo()
unset($tablename);
}
if (PMA_isValid($_REQUEST['pred_routinename'])) {
$routinename = $_REQUEST['pred_routinename'];
} elseif (PMA_isValid($_REQUEST['routinename'])) {
$routinename = $_REQUEST['routinename'];
} else {
unset($routinename);
}
if (isset($_REQUEST['pred_dbname'])) {
$is_valid_pred_dbname = true;
foreach ($_REQUEST['pred_dbname'] as $key => $db_name) {
@ -4232,6 +4275,7 @@ function PMA_getDataForDBInfo()
$username, $hostname,
isset($dbname)? $dbname : null,
isset($tablename)? $tablename : null,
isset($routinename) ? $routinename : null,
$db_and_table,
$dbname_is_wildcard,
);
@ -4378,6 +4422,21 @@ function PMA_getHtmlHeaderForUserProperties(
$html_output .= ' - ' . __('Table')
. ' <i>' . htmlspecialchars($tablename) . '</i>';
} elseif (! empty($_REQUEST['routinename'])) {
$html_output .= ' <i><a href="server_privileges.php'
. PMA_URL_getCommon(
array(
'username' => $username,
'hostname' => $hostname,
'dbname' => $url_dbname,
'routinename' => '',
)
)
. '">' . htmlspecialchars($dbname)
. '</a></i>';
$html_output .= ' - ' . __('Routine')
. ' <i>' . htmlspecialchars($tablename) . '</i>';
} else {
if (! is_array($dbname)) {
$dbname = array($dbname);
@ -4632,34 +4691,24 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
if (! is_array($dbname) && ! /*overload*/mb_strlen($tablename)
&& empty($dbname_is_wildcard)
) {
// no table name was given, display all table specific rights
// but only if $dbname contains no wildcards
$html_output .= '<form class="submenu-item" action="server_privileges.php" '
. 'id="db_or_table_specific_priv" method="post">' . "\n";
// unescape wildcards in dbname at table level
$unescaped_db = PMA_Util::unescapeMysqlWildcards($dbname);
list($html_rightsTable, $found_rows)
= PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, $unescaped_db
);
$html_output .= $html_rightsTable;
if (! /*overload*/mb_strlen($dbname)) {
// no database name was given, display select db
$html_output .= PMA_getHtmlForSelectDbInEditPrivs($found_rows);
$html_output .= PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, 'database'
);
} else {
$html_output .= PMA_displayTablesInEditPrivs($dbname, $found_rows);
}
$html_output .= '</fieldset>' . "\n";
// unescape wildcards in dbname at table level
$unescaped_db = PMA_Util::unescapeMysqlWildcards($dbname);
$html_output .= '<fieldset class="tblFooters">' . "\n"
. ' <input type="submit" value="' . __('Go') . '" />'
. '</fieldset>' . "\n"
. '</form>' . "\n";
$html_output .= PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, 'table', $unescaped_db
);
$html_output .= PMA_getHtmlForAllTableSpecificRights(
$username, $hostname, 'routine', $unescaped_db
);
}
}
// Provide a line with links to the relevant database and table
@ -5049,3 +5098,24 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
$password_set_show
);
}
/**
* Returns the type ('PROCEDURE' or 'FUNCTION') of the routine
*
* @param string $dbname database
* @param string $routineName routine
*
* @return string type
*/
function PMA_getRoutineType($dbname, $routineName)
{
$routineData = $GLOBALS['dbi']->getRoutines($dbname);
$routines = array();
foreach ($routineData as $routine) {
if ($routine['name'] === $routineName) {
return $routine['type'];
}
}
return '';
}

55
server_privileges.php
View File

@ -114,7 +114,7 @@ $_add_user_error = false;
* tablename, db_and_table, dbname_is_wildcard
*/
list(
$username, $hostname, $dbname, $tablename,
$username, $hostname, $dbname, $tablename, $routinename,
$db_and_table, $dbname_is_wildcard
) = PMA_getDataForDBInfo();
@ -179,6 +179,11 @@ if (isset($_REQUEST['change_copy'])) {
);
}
$itemType = '';
if (! empty($routinename)) {
$itemType = PMA_getRoutineType($dbname, $routinename);
}
/**
* Updates privileges
*/
@ -188,8 +193,11 @@ if (! empty($_POST['update_privs'])) {
list($sql_query[$key], $message) = PMA_updatePrivileges(
(isset($username) ? $username : ''),
(isset($hostname) ? $hostname : ''),
(isset($tablename) ? $tablename : ''),
(isset($db_name) ? $db_name : '')
(isset($tablename)
? $tablename
: (isset($routinename) ? $routinename : '')),
(isset($db_name) ? $db_name : ''),
$itemType
);
}
@ -198,8 +206,11 @@ if (! empty($_POST['update_privs'])) {
list($sql_query, $message) = PMA_updatePrivileges(
(isset($username) ? $username : ''),
(isset($hostname) ? $hostname : ''),
(isset($tablename) ? $tablename : ''),
(isset($dbname) ? $dbname : '')
(isset($tablename)
? $tablename
: (isset($routinename) ? $routinename : '')),
(isset($dbname) ? $dbname : ''),
$itemType
);
}
}
@ -220,8 +231,12 @@ if (! empty($_REQUEST['changeUserGroup']) && $cfgRelation['menuswork']
if (isset($_REQUEST['revokeall'])) {
list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
(isset($dbname) ? $dbname : ''),
(isset($tablename) ? $tablename : ''),
$username, $hostname
(isset($tablename)
? $tablename
: (isset($routinename) ? $routinename : '')),
$username,
$hostname,
$itemType
);
}
@ -382,25 +397,35 @@ if (isset($_REQUEST['adduser'])) {
);
}
} else {
if (isset($dbname) && ! is_array($dbname)) {
$url_dbname = urlencode(
str_replace(
array('\_', '\%'),
array('_', '%'),
$_REQUEST['dbname']
)
);
}
if (! isset($username)) {
// No username is given --> display the overview
$response->addHTML(
PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
);
} else if (!empty($routinename)) {
$response->addHTML(
PMA_getHtmlForRoutineSpecificPrivilges(
$username, $hostname, $dbname, $routinename,
(isset($url_dbname) ? $url_dbname : '')
)
);
} else {
// A user was selected -> display the user's properties
// In an Ajax request, prevent cached values from showing
if ($GLOBALS['is_ajax_request'] == true) {
header('Cache-Control: no-cache');
}
if (isset($dbname) && ! is_array($dbname)) {
$url_dbname = urlencode(
str_replace(
array('\_', '\%'),
array('_', '%'), $_REQUEST['dbname']
)
);
}
$response->addHTML(
PMA_getHtmlForUserProperties(
(isset($dbname_is_wildcard) ? $dbname_is_wildcard : ''),

15
templates/privileges/add_privileges_database.phtml Normal file
View File

@ -0,0 +1,15 @@
<label for="text_dbname"><?php echo __('Add privileges on the following database(s):'); ?></label>
<?php if (! empty($databases)) : ?>
<select name="pred_dbname[]" multiple="multiple">
<?php foreach ($databases as $database) : ?>
<?php $escapedDatabase = PMA_Util::escapeMysqlWildcards($database); ?>
<option value="<?php echo htmlspecialchars($escapedDatabase); ?>">
<?php echo htmlspecialchars($database); ?>
</option>
<?php endforeach; ?>
</select>
<?php endif; ?>
<input type="text" id="text_dbname" name="dbname" />
<?php echo PMA_Util::showHint(__('Wildcards % and _ should be escaped with a \ to use them literally.'))?>

14
templates/privileges/add_privileges_routine.phtml Normal file
View File

@ -0,0 +1,14 @@
<input type="hidden" name="dbname" value="<?php echo htmlspecialchars($database); ?>"/>
<label for="text_routinename"><?php echo __('Add privileges on the following routine:'); ?></label>
<?php if (! empty($routines)) : ?>
<select name="pred_routinename" 'class="autosubmit">
<option value="" selected="selected"><?php echo __('Use text field'); ?>:</option>
<?php foreach ($routines as $routine) : ?>
<option value="<?php echo htmlspecialchars($routine); ?>"><?php echo htmlspecialchars($routine); ?></option>
<?php endforeach; ?>
</select>
<?php endif; ?>
<input type="text" id="text_routinename" name="routinename" />

14
templates/privileges/add_privileges_table.phtml Normal file
View File

@ -0,0 +1,14 @@
<input type="hidden" name="dbname" value="<?php echo htmlspecialchars($database); ?>"/>
<label for="text_tablename"><?php echo __('Add privileges on the following table:'); ?></label>
<?php if (! empty($tables)) : ?>
<select name="pred_tablename" 'class="autosubmit">
<option value="" selected="selected"><?php echo __('Use text field'); ?>:</option>
<?php foreach ($tables as $table) : ?>
<option value="<?php echo htmlspecialchars($table); ?>"><?php echo htmlspecialchars($table); ?></option>
<?php endforeach; ?>
</select>
<?php endif; ?>
<input type="text" id="text_tablename" name="tablename" />

26
templates/privileges/edit_routine_privileges.phtml Normal file
View File

@ -0,0 +1,26 @@
<div id="edit_user_dialog">
<?php echo $header; ?>
<form class="submenu-item" name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">
<?php echo PMA_URL_getHiddenInputs(); ?>
<input type="hidden" name="username" value="<?php echo htmlspecialchars($username); ?>">
<input type="hidden" name="hostname" value="<?php echo htmlspecialchars($hostname); ?>">
<input type="hidden" name="dbname" value="<?php echo htmlspecialchars($database); ?>">
<input type="hidden" name="routinename" value="<?php echo htmlspecialchars($routine); ?>">
<input type="hidden" name="grant_count" value="<?php echo $grantCount; ?>">
<fieldset id="fieldset_user_global_rights">
<legend data-submenu-label="<?php echo __('Routine')?>">
<?php echo __('Routine-specific privileges'); ?>
</legend>
<p>
<small>
<i><?php echo __('Note: MySQL privilege names are expressed in English.'); ?></i>
</small>
</p>
<?php echo $privCheckboxes; ?>
</fieldset>
<fieldset id="fieldset_user_privtable_footer" class="tblFooters">
<input type="hidden" name="update_privs" value="1">
<input type="submit" value="Go">
</fieldset>
</form>
</div>

67
templates/privileges/privileges_summary.phtml Normal file
View File

@ -0,0 +1,67 @@
<form class="submenu-item" action="server_privileges.php" id="<?php echo $formId; ?>" method="post">
<?php echo PMA_URL_getHiddenInputs(); ?>
<input type="hidden" name="username" value="<?php echo htmlspecialchars($userName); ?>" />
<input type="hidden" name="hostname" value="<?php echo htmlspecialchars($hostName); ?>" />
<fieldset>
<legend data-submenu-label="<?php echo $subMenuLabel; ?>">
<?php echo $legend; ?>
</legend>
<table class="data">
<thead>
<tr>
<th><?php echo $typeLabel; ?></th>
<th><?php echo __('Privileges'); ?></th>
<th><?php echo __('Grant'); ?></th>
<?php if ($type == 'database') : ?>
<th><?php echo __('Table-specific privileges'); ?></th>
<?php elseif ($type == 'table') : ?>
<th><?php echo __('Column-specific privileges'); ?></th>
<?php endif; ?>
<th colspan="2"><?php echo __('Action'); ?></th>
</tr>
</thead>
<tbody>
<?php if (count($privileges) == 0) : ?>
<?php $colspan = ($type == 'database' ? 7 : ($type == 'table' ? 6 : 5)); ?>
<tr class="odd">
<td colspan="<?php echo $colspan; ?>"><center><i><?php echo __('None') ?></i></center></td>
</tr>
<?php else : ?>
<?php $odd = true; ?>
<?php foreach ($privileges as $privilege) : ?>
<?php echo PMA\Template::get('privileges/privileges_summary_row')
->render(
array_merge(
$privilege,
array(
'odd' => $odd,
'type' => $type,
)
)
); ?>
<?php $odd = !$odd; ?>
<?php endforeach; ?>
<?php endif; ?>
</tbody>
</table>
<?php if ($type == 'database') : ?>
<?php echo PMA\Template::get('privileges/add_privileges_database')
->render(array('databases' => $databases)); ?>
<?php elseif ($type == 'table') : ?>
<?php echo PMA\Template::get('privileges/add_privileges_table')
->render(array('database' => $database, 'tables' => $tables)); ?>
<?php else: // routine ?>
<?php echo PMA\Template::get('privileges/add_privileges_routine')
->render(array('database' => $database, 'routines' => $routines)); ?>
<?php endif; ?>
</fieldset>
<fieldset class="tblFooters">
<input type="submit" value="<?php echo __('Go'); ?>" />
</fieldset>
</form>

14
templates/privileges/privileges_summary_row.phtml Normal file
View File

@ -0,0 +1,14 @@
<tr class="<?php echo ($odd ? 'odd' : 'even'); ?>">
<td><?php echo htmlspecialchars($name); ?></td>
<td><code><?php echo $privileges; ?></code></td>
<td><?php echo ($grant ? __('Yes') : __('No')); ?></td>
<?php if ($type == 'database') : ?>
<td><?php echo ($tablePrivs ? __('Yes') : __('No')); ?></td>
<?php elseif ($type == 'table') : ?>
<td><?php echo ($columnPrivs ? __('Yes') : __('No')); ?></td>
<?php endif; ?>
<td><?php echo $editLink; ?></td>
<td><?php echo $revokeLink; ?></td>
</tr>

221
test/libraries/PMA_server_privileges_test.php
View File

@ -150,7 +150,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$_REQUEST['tablename'] = "PMA_tablename";
$_REQUEST['dbname'] = "PMA_dbname";
list(
$username, $hostname, $dbname, $tablename,
$username, $hostname, $dbname, $tablename, $routinename,
$db_and_table, $dbname_is_wildcard
) = PMA_getDataForDBInfo();
$this->assertEquals(
@ -182,7 +182,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$_REQUEST['pred_tablename'] = "PMA_pred__tablename";
$_REQUEST['pred_dbname'] = array("PMA_pred_dbname");
list(
,, $dbname, $tablename,
,, $dbname, $tablename, $routinename,
$db_and_table, $dbname_is_wildcard
) = PMA_getDataForDBInfo();
$this->assertEquals(
@ -745,7 +745,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$_POST['max_questions'] = 1000;
list ($message, $sql_query)
= PMA_getMessageAndSqlQueryForPrivilegesRevoke(
$dbname, $tablename, $username, $hostname
$dbname, $tablename, $username, $hostname, ''
);
$this->assertEquals(
@ -753,9 +753,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$message->getMessage()
);
$this->assertEquals(
"REVOKE ALL PRIVILEGES ON `pma_dbname`.`pma_tablename` "
"REVOKE ALL PRIVILEGES ON `pma_dbname`.`pma_tablename` "
. "FROM 'pma_username'@'pma_hostname'; "
. "REVOKE GRANT OPTION ON `pma_dbname`.`pma_tablename` "
. "REVOKE GRANT OPTION ON `pma_dbname`.`pma_tablename` "
. "FROM 'pma_username'@'pma_hostname';",
$sql_query
);
@ -779,7 +779,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$_POST['Grant_priv'] = 'Y';
$_POST['max_questions'] = 1000;
list($sql_query, $message) = PMA_updatePrivileges(
$username, $hostname, $tablename, $dbname
$username, $hostname, $tablename, $dbname, ''
);
$this->assertEquals(
@ -787,7 +787,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$message->getMessage()
);
$this->assertEquals(
"REVOKE ALL PRIVILEGES ON `pma_dbname`.`pma_tablename` "
"REVOKE ALL PRIVILEGES ON `pma_dbname`.`pma_tablename` "
. "FROM 'pma_username'@'pma_hostname'; ",
$sql_query
);
@ -1475,7 +1475,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$tablename = "pma_tablename";
$html = PMA_getUserLink(
'edit', $username, $hostname, $dbname, $tablename
'edit', $username, $hostname, $dbname, $tablename, ''
);
$url_html = PMA_URL_getCommon(
@ -1484,6 +1484,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
'hostname' => $hostname,
'dbname' => $dbname,
'tablename' => $tablename,
'routinename' => '',
)
);
$this->assertContains(
@ -1496,7 +1497,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
);
$html = PMA_getUserLink(
'revoke', $username, $hostname, $dbname, $tablename
'revoke', $username, $hostname, $dbname, $tablename, ''
);
$url_html = PMA_URL_getCommon(
@ -1505,6 +1506,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
'hostname' => $hostname,
'dbname' => $dbname,
'tablename' => $tablename,
'routinename' => '',
'revokeall' => 1,
)
);
@ -2021,49 +2023,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
);
}
/**
* Tests for PMA_getUserSpecificRights
*
* @return void
*/
function testPMAGetUserSpecificRights()
{
// Setup for the test
$GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
->will(
$this->onConsecutiveCalls(
array('Db' => 'y'), false, array('Db' => 'y'), false,
false, array('Table_name' => 't')
)
);
// Test case 1
$tables = array('columns_priv');
$user_host_condition = '';
$dbname = '';
$expected = array(
'y' => array(
'privs' => array('USAGE'),
'Db' => 'y',
'Grant_priv' => 'N',
'Column_priv' => true,
'can_delete' => true
)
);
$actual = PMA_getUserSpecificRights($tables, $user_host_condition, $dbname);
$this->assertEquals($expected, $actual);
// Test case 2
$dbname = 'db';
$expected = array(
't' => array(
'Table_name' => 't'
)
);
$actual = PMA_getUserSpecificRights($tables, $user_host_condition, $dbname);
$this->assertEquals($expected, $actual);
}
/**
* Tests for PMA_getHtmlForUserProperties
*
@ -2105,61 +2064,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
);
}
/**
* Tests for PMA_getHtmlForUserRights
*
* @return void
*/
function testPMAGetHtmlForUserRights()
{
// Test case 1
$db_rights = array(
'y' => array(
'privs' => array('USAGE'),
'Db' => 'y',
'Grant_priv' => 'N',
'Column_priv' => true,
'can_delete' => true
)
);
$exp_found_rows = array('y');
$actual = PMA_getHtmlForUserRights($db_rights, '', 'host', 'user');
$this->assertArrayHasKey(0, $actual);
$this->assertArrayHasKey(1, $actual);
$this->assertEquals($exp_found_rows, $actual[0]);
$this->assertContains('Edit privileges', $actual[1]);
$this->assertContains('Revoke', $actual[1]);
$this->assertContains(
'<tr class="odd">',
$actual[1]
);
$this->assertContains(
'<dfn title="No privileges.">USAGE</dfn>',
$actual[1]
);
$this->assertContains(
'<img src="imageb_usredit.png" title="Edit privileges" '
. 'alt="Edit privileges" />',
$actual[1]
);
$this->assertContains(
'<img src="imageb_usrdrop.png" title="Revoke" alt="Revoke" />',
$actual[1]
);
// Test case 2
$actual = PMA_getHtmlForUserRights(array(), '', '', '');
$this->assertArrayHasKey(0, $actual);
$this->assertArrayHasKey(1, $actual);
$this->assertEquals(array(), $actual[0]);
$this->assertEquals(
'<tr class="odd">' . "\n"
. '<td colspan="6"><center><i>None</i></center></td>' . "\n"
. '</tr>' . "\n",
$actual[1]
);
}
/**
* Tests for PMA_getHtmlForAllTableSpecificRights
*
@ -2168,117 +2072,28 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
function testPMAGetHtmlForAllTableSpecificRights()
{
// Test case 1
$actual = PMA_getHtmlForAllTableSpecificRights('pma', 'host', 'pmadb');
$this->assertArrayHasKey(0, $actual);
$this->assertArrayHasKey(1, $actual);
$actual = PMA_getHtmlForAllTableSpecificRights('pma', 'host', 'table', 'pmadb');
$this->assertContains(
'<input type="hidden" name="username" value="pma" />',
$actual[0]
$actual
);
$this->assertContains(
'<input type="hidden" name="hostname" value="host" />',
$actual[0]
$actual
);
$this->assertContains(
'<legend data-submenu-label="Table">'
. 'Table-specific privileges',
$actual[0]
$actual
);
$this->assertEquals(array(), $actual[1]);
// Test case 2
$actual = PMA_getHtmlForAllTableSpecificRights('pma2', 'host2', '');
$this->assertArrayHasKey(0, $actual);
$this->assertArrayHasKey(1, $actual);
$GLOBALS['pma'] = new stdClass();
$GLOBALS['pma']->databases = array('x', 'y', 'z');
$actual = PMA_getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
$this->assertContains(
'<legend data-submenu-label="Database">'
. 'Database-specific privileges',
$actual[0]
);
}
/**
* Tests for PMA_getHtmlForSelectDbInEditPrivs
*
* @return void
*/
function testPMAGetHtmlForSelectDbInEditPrivs()
{
$GLOBALS['pma'] = new StdClass();
$GLOBALS['pma']->databases = array(
'pmadb',
'testdb',
'mysql'
);
$actual = PMA_getHtmlForSelectDbInEditPrivs(array('pmadb'));
$this->assertContains(
'<label for="text_dbname">'
. 'Add privileges on the following database(s):',
$actual
);
$this->assertContains(
'<select name="pred_dbname[]" multiple="multiple">',
$actual
);
$this->assertContains(
'<option value="testdb">testdb',
$actual
);
$this->assertContains(
'<option value="mysql">mysql',
$actual
);
$this->assertContains(
'<input type="text" id="text_dbname" name="dbname" />',
$actual
);
$this->assertContains(
'Wildcards % and _ should be escaped with a \ to use them literally.',
$actual
);
}
/**
* Tests for PMA_displayTablesInEditPrivs
*
* @return void
*/
function testPMADisplayTablesInEditPrivs()
{
// Setup for the test
$GLOBALS['dbi']->expects($this->any())->method('fetchRow')
->will($this->onConsecutiveCalls(array('t<bl'), array('ab"c')));
// Test case 1
$actual = PMA_displayTablesInEditPrivs('testdb', array());
$this->assertContains(
'<input type="hidden" name="dbname"',
$actual
);
$this->assertContains(
'<label for="text_tablename">Add privileges on the following table:',
$actual
);
$this->assertContains(
'<input type="text" id="text_tablename" name="tablename" />',
$actual
);
$this->assertContains(
'<select name="pred_tablename" class="autosubmit">',
$actual
);
$this->assertContains(
'<option value="" selected="selected">Use text field:',
$actual
);
$this->assertContains(
'<option value="t&lt;bl">t&lt;bl</option>', $actual
);
$this->assertContains(
'<option value="ab&quot;c">ab&quot;c</option>', $actual
);
$this->assertContains(
'<input type="text" id="text_tablename" name="tablename" />',
$actual
);
}