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

Refactor html for choosing user group to use template

Browse Source 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
This commit is contained in:
Deven Bansod 2016-11-22 10:18:14 +05:30
parent e95b54a407
commit 0f411d04ca
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libraries/server_privileges.lib.php
View File

@ -528,29 +528,12 @@ function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
*/
function PMA_getHtmlToChooseUserGroup($username)
{
$html_output = '<form class="ajax" id="changeUserGroupForm"'
. ' action="server_privileges.php" method="post">';
$params = array('username' => $username);
$html_output .= URL::getHiddenInputs($params);
$html_output .= '<fieldset id="fieldset_user_group_selection">';
$html_output .= '<legend>' . __('User group') . '</legend>';
$cfgRelation = PMA_getRelationsParam();
$groupTable = Util::backquote($cfgRelation['db'])
. "." . Util::backquote($cfgRelation['usergroups']);
$userTable = Util::backquote($cfgRelation['db'])
. "." . Util::backquote($cfgRelation['users']);
$userGroups = array();
$sql_query = "SELECT DISTINCT `usergroup` FROM " . $groupTable;
$result = PMA_queryAsControlUser($sql_query, false);
if ($result) {
while ($row = $GLOBALS['dbi']->fetchRow($result)) {
$userGroups[] = $row[0];
}
}
$GLOBALS['dbi']->freeResult($result);
$userGroup = '';
if (isset($GLOBALS['username'])) {
$sql_query = "SELECT `usergroup` FROM " . $userTable
@ -560,20 +543,25 @@ function PMA_getHtmlToChooseUserGroup($username)
);
}
$html_output .= __('User group') . ': ';
$html_output .= '<select name="userGroup">';
$html_output .= '<option value=""></option>';
foreach ($userGroups as $oneUserGroup) {
$html_output .= '<option value="' . htmlspecialchars($oneUserGroup) . '"'
. ($oneUserGroup == $userGroup ? ' selected="selected"' : '')
. '>'
. htmlspecialchars($oneUserGroup)
. '</option>';
$allUserGroups = array('' => '');
$sql_query = "SELECT DISTINCT `usergroup` FROM " . $groupTable;
$result = PMA_queryAsControlUser($sql_query, false);
if ($result) {
while ($row = $GLOBALS['dbi']->fetchRow($result)) {
$allUserGroups[$row[0]] = $row[0];
}
}
$html_output .= '</select>';
$html_output .= '<input type="hidden" name="changeUserGroup" value="1">';
$html_output .= '</fieldset>';
$html_output .= '</form>';
$GLOBALS['dbi']->freeResult($result);
// render the template
$data = array(
'allUserGroups' => $allUserGroups,
'userGroup' => $userGroup,
'params' => array('username' => $username)
);
$html_output = Template::get('privileges/choose_user_group')
->render($data);
return $html_output;
}

9
templates/privileges/choose_user_group.phtml Normal file
View File

@ -0,0 +1,9 @@
<form class="ajax" id="changeUserGroupForm" action="server_privileges.php" method="post">
<?= PMA\libraries\URL::getHiddenInputs($params); ?>
<fieldset id="fieldset_user_group_selection">
<legend><?= __('User group') ?></legend>
<?= __('User group') ?> :
<?= PMA\libraries\Util::getDropdown('userGroup', $allUserGroups, $userGroup, 'userGroup_select'); ?>
<input type="hidden" name="changeUserGroup" value="1">
</fieldset>
</form>