Retrieve parameters from $_POST in server_user_groups.php
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
parent
79548c0dcf
commit
89db84213b
@ -110,31 +110,34 @@ class UserGroups
|
||||
$html_output .= '<td>' . self::getAllowedTabNames($tabs, 'table') . '</td>';
|
||||
|
||||
$html_output .= '<td>';
|
||||
$html_output .= '<a class="" href="server_user_groups.php'
|
||||
$html_output .= '<a class="" href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'viewUsers' => 1, 'userGroup' => $groupName
|
||||
)
|
||||
),
|
||||
''
|
||||
)
|
||||
. '">'
|
||||
. Util::getIcon('b_usrlist', __('View users'))
|
||||
. '</a>';
|
||||
$html_output .= ' ';
|
||||
$html_output .= '<a class="" href="server_user_groups.php'
|
||||
$html_output .= '<a class="" href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'editUserGroup' => 1, 'userGroup' => $groupName
|
||||
)
|
||||
),
|
||||
''
|
||||
)
|
||||
. '">'
|
||||
. Util::getIcon('b_edit', __('Edit')) . '</a>';
|
||||
$html_output .= ' ';
|
||||
$html_output .= '<a class="deleteUserGroup ajax"'
|
||||
. ' href="server_user_groups.php'
|
||||
. ' href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'deleteUserGroup' => 1, 'userGroup' => $groupName
|
||||
)
|
||||
),
|
||||
''
|
||||
)
|
||||
. '">'
|
||||
. Util::getIcon('b_drop', __('Delete')) . '</a>';
|
||||
@ -364,7 +367,7 @@ class UserGroups
|
||||
$sql_query .= ", ";
|
||||
}
|
||||
$tabName = $tabGroupName . '_' . $tab;
|
||||
$allowed = isset($_REQUEST[$tabName]) && $_REQUEST[$tabName] == 'Y';
|
||||
$allowed = isset($_POST[$tabName]) && $_POST[$tabName] == 'Y';
|
||||
$sql_query .= "('" . $GLOBALS['dbi']->escapeString($userGroup) . "', '" . $tabName . "', '"
|
||||
. ($allowed ? "Y" : "N") . "')";
|
||||
$first = false;
|
||||
|
||||
@ -40,35 +40,35 @@ $response->addHTML(Users::getHtmlForSubMenusOnUsersPage('server_user_groups.php'
|
||||
/**
|
||||
* Delete user group
|
||||
*/
|
||||
if (! empty($_REQUEST['deleteUserGroup'])) {
|
||||
UserGroups::delete($_REQUEST['userGroup']);
|
||||
if (! empty($_POST['deleteUserGroup'])) {
|
||||
UserGroups::delete($_POST['userGroup']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new user group
|
||||
*/
|
||||
if (! empty($_REQUEST['addUserGroupSubmit'])) {
|
||||
UserGroups::edit($_REQUEST['userGroup'], true);
|
||||
if (! empty($_POST['addUserGroupSubmit'])) {
|
||||
UserGroups::edit($_POST['userGroup'], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a user group
|
||||
*/
|
||||
if (! empty($_REQUEST['editUserGroupSubmit'])) {
|
||||
UserGroups::edit($_REQUEST['userGroup']);
|
||||
if (! empty($_POST['editUserGroupSubmit'])) {
|
||||
UserGroups::edit($_POST['userGroup']);
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['viewUsers'])) {
|
||||
if (isset($_POST['viewUsers'])) {
|
||||
// Display users belonging to a user group
|
||||
$response->addHTML(UserGroups::getHtmlForListingUsersofAGroup($_REQUEST['userGroup']));
|
||||
$response->addHTML(UserGroups::getHtmlForListingUsersofAGroup($_POST['userGroup']));
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['addUserGroup'])) {
|
||||
if (isset($_GET['addUserGroup'])) {
|
||||
// Display add user group dialog
|
||||
$response->addHTML(UserGroups::getHtmlToEditUserGroup());
|
||||
} elseif (isset($_REQUEST['editUserGroup'])) {
|
||||
} elseif (isset($_POST['editUserGroup'])) {
|
||||
// Display edit user group dialog
|
||||
$response->addHTML(UserGroups::getHtmlToEditUserGroup($_REQUEST['userGroup']));
|
||||
$response->addHTML(UserGroups::getHtmlToEditUserGroup($_POST['userGroup']));
|
||||
} else {
|
||||
// Display user groups table
|
||||
$response->addHTML(UserGroups::getHtmlForUserGroupsTable());
|
||||
|
||||
@ -124,33 +124,36 @@ class UserGroupsTest extends TestCase
|
||||
'<td>usergroup</td>',
|
||||
$html
|
||||
);
|
||||
$url_tag = '<a class="" href="server_user_groups.php'
|
||||
$url_tag = '<a class="" href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
|
||||
)
|
||||
),
|
||||
''
|
||||
);
|
||||
$this->assertContains(
|
||||
$url_tag,
|
||||
$html
|
||||
);
|
||||
$url_tag = '<a class="" href="server_user_groups.php'
|
||||
$url_tag = '<a class="" href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'editUserGroup'=>1,
|
||||
'userGroup'=>htmlspecialchars('usergroup')
|
||||
)
|
||||
),
|
||||
''
|
||||
);
|
||||
$this->assertContains(
|
||||
$url_tag,
|
||||
$html
|
||||
);
|
||||
$url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
|
||||
$url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php" data-post="'
|
||||
. Url::getCommon(
|
||||
array(
|
||||
'deleteUserGroup'=> 1,
|
||||
'userGroup'=>htmlspecialchars('usergroup')
|
||||
)
|
||||
),
|
||||
""
|
||||
);
|
||||
$this->assertContains(
|
||||
$url_tag,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user