Skip to content

Commit

Permalink
Remove unnecessary project_id form parameter
Browse files Browse the repository at this point in the history
When processing a single category, the project id can be retrieved from
the category record, so using a form parameter is redundant and could
be inconsistent with the category id.

Fixes #27303
  • Loading branch information
dregad committed Sep 23, 2020
1 parent 6b9160e commit 13ae48b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
8 changes: 2 additions & 6 deletions manage_proj_cat_delete.php
Expand Up @@ -57,7 +57,6 @@
auth_reauthenticate();

$f_category_id = gpc_get_int( 'id' );
$f_project_id = gpc_get_int( 'project_id' );

$t_row = category_get_row( $f_category_id );
$t_name = category_full_name( $f_category_id );
Expand All @@ -79,16 +78,13 @@

form_security_purge( 'manage_proj_cat_delete' );

if( $f_project_id == ALL_PROJECTS ) {
if( $t_project_id == ALL_PROJECTS ) {
$t_redirect_url = 'manage_proj_page.php';
} else {
$t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $f_project_id;
$t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $t_project_id;
}

layout_page_header( null, $t_redirect_url );

layout_page_begin( 'manage_overview_page.php' );

html_operation_successful( $t_redirect_url );

layout_page_end();
2 changes: 0 additions & 2 deletions manage_proj_cat_edit_page.php
Expand Up @@ -85,7 +85,6 @@
<table class="table table-bordered table-condensed table-striped">
<fieldset>
<?php echo form_security_field( 'manage_proj_cat_update' ) ?>
<input type="hidden" name="project_id" value="<?php echo $f_project_id ?>"/>
<input type="hidden" name="category_id" value="<?php echo string_attribute( $f_category_id ) ?>" />
<tr>
<td class="category">
Expand Down Expand Up @@ -124,7 +123,6 @@
<fieldset>
<?php echo form_security_field( 'manage_proj_cat_delete' ) ?>
<input type="hidden" name="id" value="<?php echo string_attribute( $f_category_id ) ?>" />
<input type="hidden" name="project_id" value="<?php echo string_attribute( $f_project_id ) ?>" />
<input type="submit" class="btn btn-sm btn-primary btn-white btn-round" value="<?php echo lang_get( 'delete_category_button' ) ?>" />
</fieldset>
</form>
Expand Down
9 changes: 4 additions & 5 deletions manage_proj_cat_update.php
Expand Up @@ -54,12 +54,9 @@
auth_reauthenticate();

$f_category_id = gpc_get_int( 'category_id' );
$f_project_id = gpc_get_int( 'project_id', ALL_PROJECTS );
$f_name = trim( gpc_get_string( 'name' ) );
$f_assigned_to = gpc_get_int( 'assigned_to', 0 );

access_ensure_project_level( config_get( 'manage_project_threshold' ), $f_project_id );

if( is_blank( $f_name ) ) {
error_parameters( 'name' );
trigger_error( ERROR_EMPTY_FIELD, ERROR );
Expand All @@ -69,6 +66,8 @@
$t_old_name = $t_row['name'];
$t_project_id = $t_row['project_id'];

access_ensure_project_level( config_get( 'manage_project_threshold' ), $t_project_id );

# check for duplicate
if( mb_strtolower( $f_name ) != mb_strtolower( $t_old_name ) ) {
category_ensure_unique( $t_project_id, $f_name );
Expand All @@ -78,10 +77,10 @@

form_security_purge( 'manage_proj_cat_update' );

if( $f_project_id == ALL_PROJECTS ) {
if( $t_project_id == ALL_PROJECTS ) {
$t_redirect_url = 'manage_proj_page.php';
} else {
$t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $f_project_id;
$t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $t_project_id;
}

layout_page_header( null, $t_redirect_url );
Expand Down

0 comments on commit 13ae48b

Please sign in to comment.