Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15650 Modified Files: bug_change_status_page.php manage_config_email_page.php manage_config_work_threshold_page.php manage_config_work_threshold_set.php manage_proj_page.php Log Message: Lineterm fix Index: bug_change_status_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_change_status_page.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- bug_change_status_page.php 18 Mar 2005 03:40:19 -0000 1.19 +++ bug_change_status_page.php 3 Apr 2005 12:43:30 -0000 1.20 @@ -23,7 +23,7 @@ $f_bug_id = gpc_get_int( 'bug_id' ); $f_new_status = gpc_get_int( 'new_status' ); $f_reopen_flag = gpc_get_int( 'reopen_flag', OFF ); - + if ( ! ( ( access_has_bug_level( access_get_status_threshold( $f_new_status, bug_get_field( $f_bug_id, 'project_id' ) ), $f_bug_id ) ) || ( ( bug_get_field( $f_bug_id, 'reporter_id' ) == auth_get_current_user_id() ) && ( ( ON == config_get( 'allow_reporter_reopen' ) ) || Index: manage_proj_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_page.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- manage_proj_page.php 31 Mar 2005 02:32:32 -0000 1.16 +++ manage_proj_page.php 3 Apr 2005 12:43:31 -0000 1.17 @@ -92,7 +92,7 @@ # only print row if user has project management privileges if (access_has_project_level( $t_manage_project_threshold, $t_project_id, auth_get_current_user_id() ) ) { - + ?> <tr <?php echo helper_alternate_class() ?>> <td> @@ -114,7 +114,7 @@ <?php } $t_subprojects = project_hierarchy_get_subprojects( $t_project_id ); - + if ( 0 < count( $t_projects ) || 0 < count( $t_subprojects ) ) { array_unshift( $t_stack, $t_projects ); } Index: manage_config_email_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_config_email_page.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- manage_config_email_page.php 23 Mar 2005 23:57:48 -0000 1.5 +++ manage_config_email_page.php 3 Apr 2005 12:43:31 -0000 1.6 @@ -104,7 +104,7 @@ $t_project_title = sprintf( lang_get( 'config_project' ) , project_get_name( $t_project ) ); } echo '<p class="bold">' . $t_project_title . '</p>' . "\n"; - + get_section_begin_for_email( lang_get( 'email_notification' ) ); get_capability_row_for_email( lang_get( 'email_on_new' ), 'new' ); get_capability_row_for_email( lang_get( 'email_on_assigned' ), 'owner' ); Index: manage_config_work_threshold_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_config_work_threshold_page.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- manage_config_work_threshold_page.php 23 Mar 2005 23:57:50 -0000 1.3 +++ manage_config_work_threshold_page.php 3 Apr 2005 12:43:31 -0000 1.4 @@ -29,7 +29,7 @@ function get_section_begin( $p_section_name ) { global $t_access_levels; - + echo '<table class="width100">'; echo '<tr><td class="form-title" colspan="' . ( count( $t_access_levels ) + 2 ) . '">' . strtoupper( $p_section_name ) . '</td></tr>' . "\n"; echo '<tr><td class="form-title" width="40%" rowspan="2">' . lang_get( 'perm_rpt_capability' ) . '</td>'; @@ -44,9 +44,9 @@ function get_capability_row( $p_caption, $p_threshold, $p_all_projects_only=false ) { global $t_user, $t_project, $t_show_submit, $t_access_levels; - + $t_needed_access = config_get( $p_threshold ); - $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) + $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ); echo '<tr ' . helper_alternate_class() . '><td>' . string_display( $p_caption ) . '</td>'; @@ -84,8 +84,8 @@ function get_capability_boolean( $p_caption, $p_threshold, $p_all_projects_only=false ) { global $t_user, $t_project, $t_show_submit, $t_access_levels; - - $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) + + $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ); echo '<tr ' . helper_alternate_class() . '><td>' . string_display( $p_caption ) . '</td>'; @@ -112,11 +112,11 @@ echo '</tr>' . "\n"; } - + function get_capability_enum( $p_caption, $p_threshold, $p_enum, $p_all_projects_only=false ) { global $t_user, $t_project, $t_show_submit, $t_access_levels; - - $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) + + $t_can_change = access_has_project_level( config_get_access( $p_threshold ), $t_project, $t_user ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ); echo '<tr ' . helper_alternate_class() . '><td>' . string_display( $p_caption ) . '</td>'; @@ -144,20 +144,20 @@ echo '</tr>' . "\n"; } - + function get_section_end() { echo '</table><br />' . "\n"; } echo "<br /><br />\n"; - + if ( ALL_PROJECTS == $t_project ) { $t_project_title = lang_get( 'config_all_projects' ); } else { $t_project_title = sprintf( lang_get( 'config_project' ) , project_get_name( $t_project ) ); } echo '<p class="bold">' . $t_project_title . '</p>' . "\n"; - + echo "<form name=\"mail_config_action\" method=\"post\" action=\"manage_config_work_threshold_set.php\">\n"; # Issues Index: manage_config_work_threshold_set.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_config_work_threshold_set.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- manage_config_work_threshold_set.php 23 Mar 2005 23:57:51 -0000 1.3 +++ manage_config_work_threshold_set.php 3 Apr 2005 12:43:31 -0000 1.4 @@ -25,17 +25,17 @@ function set_capability_row( $p_threshold, $p_all_projects_only=false ) { global $t_access, $t_project; - + if ( ( $t_access >= config_get_access( $p_threshold ) ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ) ) { $f_threshold = gpc_get( 'flag_thres_' . $p_threshold ); $f_access = gpc_get_int( 'access_' . $p_threshold ); - # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_threshold, $f_access); echo '<br />'; + # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_threshold, $f_access); echo '<br />'; $t_access_levels = explode_enum_string( config_get( 'access_levels_enum_string' ) ); - + $t_lower_threshold = ANYBODY; $t_array_threshold = array(); - + foreach( $t_access_levels as $t_access_level ) { $t_entry_array = explode_enum_arr( $t_access_level ); $t_set = $t_entry_array[0]; @@ -55,31 +55,31 @@ config_set( $p_threshold, $t_array_threshold, NO_USER, $t_project, $f_access ); } else { config_set( $p_threshold, $t_lower_threshold, NO_USER, $t_project, $f_access ); - } + } } } function set_capability_boolean( $p_threshold, $p_all_projects_only=false ) { global $t_access, $t_project; - + if ( ( $t_access >= config_get_access( $p_threshold ) ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ) ) { $f_flag = gpc_get( 'flag_' . $p_threshold, OFF ); $f_access = gpc_get_int( 'access_' . $p_threshold ); - # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_flag, $f_access); echo '<br />'; - + # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_flag, $f_access); echo '<br />'; + config_set( $p_threshold, $f_flag, NO_USER, $t_project, $f_access ); } } function set_capability_enum( $p_threshold, $p_all_projects_only=false ) { global $t_access, $t_project; - + if ( ( $t_access >= config_get_access( $p_threshold ) ) && ( ( ALL_PROJECTS == $t_project ) || ! $p_all_projects_only ) ) { $f_flag = gpc_get( 'flag_' . $p_threshold ); $f_access = gpc_get_int( 'access_' . $p_threshold ); - # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_flag, $f_access); echo '<br />'; + # @@debug @@ echo "<br />for $p_threshold "; var_dump($f_flag, $f_access); echo '<br />'; config_set( $p_threshold, $f_flag, NO_USER, $t_project, $f_access ); } |