Index: account_voting_page.php =================================================================== --- account_voting_page.php (revision 0) +++ account_voting_page.php (revision 0) @@ -0,0 +1,143 @@ +status < $t_resolved) || $t_show_all ) + { + $t_project_name = project_get_name($t_issue->project_id); + $t_votes_info[] = array('vote'=>$t_vote, 'issue'=>$t_issue, 'project_name'=>$t_project_name); + } +} + +?> + +
+ + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + 0){ + ?> + + + + + + + + + + + + + + + + + + + +
+ +
+ + + 0)?('+'.$t_vote_info['vote']['weight']):$t_vote_info['vote']['weight'] ?> + + votes_num_voters ?> + + votes_positive - $t_vote_info['issue']->votes_negative; + echo ($t_balance>0)?('+'.$t_balance):$t_balance; + ?> + + + + status ) ); ?> + + summary ); + if ( VS_PRIVATE == $t_vote_info['issue']->view_state ) { + printf( ' (%s)', $t_icon_path . 'protected.gif', lang_get( 'private' ), lang_get( 'private' ) ); + } + ?> +
+ = + + +
+ +
+ ( $t_show_all ? 0 : 1 ) ) ); +?> +
+ + \ No newline at end of file Property changes on: account_voting_page.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: admin/schema.php =================================================================== --- admin/schema.php (revision 5176) +++ admin/schema.php (working copy) @@ -404,5 +404,20 @@ " ) ); $upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_project_version_table' ), " obsolete L NOTNULL DEFAULT \" '0' \"" ) ); + +# first version of voting +$upgrade[] = Array( 'CreateTableSQL', Array( db_get_table( 'mantis_bug_votes_table' ), " + issue_id I UNSIGNED NOTNULL PRIMARY DEFAULT '0', + user_id I UNSIGNED NOTNULL PRIMARY DEFAULT '0', + weight I NOTNULL DEFAULT '0' + ", Array( 'mysql' => 'TYPE=MyISAM', 'pgsql' => 'WITHOUT OIDS' ) ) ); $upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_bug_table' ), " + votes_positive I UNSIGNED NOTNULL DEFAULT '0', + votes_negative I UNSIGNED NOTNULL DEFAULT '0', + votes_num_voters I UNSIGNED NOTNULL DEFAULT '0' + " ) ); +$upgrade[] = Array('CreateIndexSQL',Array('idx_votes_num_voters',db_get_table('mantis_bug_table'),'votes_num_voters')); + +$upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_bug_table' ), " due_date T NOTNULL DEFAULT '1970-01-01' " ) ); + Index: bug_view_advanced_page.php =================================================================== --- bug_view_advanced_page.php (revision 5176) +++ bug_view_advanced_page.php (working copy) @@ -577,6 +577,9 @@ \ No newline at end of file Property changes on: bug_vote_add.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: bug_vote_delete.php =================================================================== --- bug_vote_delete.php (revision 0) +++ bug_vote_delete.php (revision 0) @@ -0,0 +1,18 @@ + \ No newline at end of file Property changes on: bug_vote_delete.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: bug_vote_list_view_inc.php =================================================================== --- bug_vote_list_view_inc.php (revision 0) +++ bug_vote_list_view_inc.php (revision 0) @@ -0,0 +1,157 @@ + 0; + $t_can_view_vote_details = vote_can_view_vote_details($f_bug_id, $t_current_user_id); + $t_can_vote = vote_can_vote($f_bug_id, $t_current_user_id); + + $t_show_votes = $t_votes_exist || $t_can_vote; + + $t_total_positive = bug_get_field( $f_bug_id, 'votes_positive' ); + $t_total_negative = bug_get_field( $f_bug_id, 'votes_negative' ); + $t_total_votes = $t_total_positive - $t_total_negative; + + $t_total_voters = bug_get_field( $f_bug_id, 'votes_num_voters' ); + + $t_button_text = lang_get('vote_cast_button'); + $t_bug_id = string_attribute( $f_bug_id ); + + $t_voting_weight_options = config_get( 'voting_weight_options' ); + asort($t_voting_weight_options); + $t_voting_weight_default = config_get( 'voting_weight_default' ); + + $t_max_votes = vote_max_votes( $t_current_user_id ); + $t_used_votes = vote_used_votes( $t_current_user_id ); + $t_issue_project = bug_get_field( $f_bug_id, 'project_id'); + $t_available_votes = vote_available_votes( $t_current_user_id, $t_issue_project ); + $t_voting_max_vote_weight = vote_max_weight( $t_current_user_id, $t_issue_project ); + +} else { + $t_show_votes = false; +} +?> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
Vote on issue + $f_bug_id, 'action' => 'DELETE' ) ); + } + + } + else { # show 'add vote' button + ?> + +
+ 0){ ?> + + + + 0 ?> + + ( , ) + +
+ +
Summary + =
+ =
+ =
+ = + +
Voters List + +
+ =1)?'+'.$userVote['weight']:$userVote['weight'] ?> +
+ +
+ + + + + + + +
+ + ( = , = ) +
+ + Property changes on: bug_vote_list_view_inc.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: config_defaults_inc.php =================================================================== --- config_defaults_inc.php (revision 5176) +++ config_defaults_inc.php (working copy) @@ -529,22 +529,22 @@ # resolution, fixed_in_version, view_state, os, os_build, build (for product build), platform, version, date_submitted, attachment, # category, sponsorship_total, severity, status, last_updated, summary, bugnotes_count, description, # steps_to_reproduce, additional_information - $g_view_issues_page_columns = array ( 'selection', 'edit', 'priority', 'id', 'sponsorship_total', 'bugnotes_count', 'attachment', 'category', 'severity', 'status', 'last_updated', 'summary' ); + $g_view_issues_page_columns = array ( 'selection', 'edit', 'priority', 'id', 'votes_total', 'votes_num_voters', 'sponsorship_total', 'bugnotes_count', 'attachment', 'category', 'severity', 'status', 'last_updated', 'summary' ); # The default columns to be included in the Print Issues Page. # This can be overriden using Manage -> Manage Configuration -> Manage Columns # Also each user can configure their own columns using My Account -> Manage Columns - $g_print_issues_page_columns = array ( 'selection', 'priority', 'id', 'sponsorship_total', 'bugnotes_count', 'attachment', 'category', 'severity', 'status', 'last_updated', 'summary' ); + $g_print_issues_page_columns = array ( 'selection', 'priority', 'id', 'votes_total', 'votes_num_voters', 'sponsorship_total', 'bugnotes_count', 'attachment', 'category', 'severity', 'status', 'last_updated', 'summary' ); # The default columns to be included in the CSV export. # This can be overriden using Manage -> Manage Configuration -> Manage Columns # Also each user can configure their own columns using My Account -> Manage Columns - $g_csv_columns = array ( 'id', 'project_id', 'reporter_id', 'handler_id', 'priority', 'severity', 'reproducibility', 'version', 'projection', 'category', 'date_submitted', 'eta', 'os', 'os_build', 'platform', 'view_state', 'last_updated', 'summary', 'status', 'resolution', 'fixed_in_version' ); + $g_csv_columns = array ( 'id', 'project_id', 'reporter_id', 'handler_id', 'priority', 'severity', 'reproducibility', 'version', 'projection', 'category', 'date_submitted', 'eta', 'os', 'os_build', 'platform', 'view_state', 'last_updated', 'summary', 'status', 'resolution', 'fixed_in_version', 'votes_positive', 'votes_negative', 'votes_num_voters' ); # The default columns to be included in the Excel export. # This can be overriden using Manage -> Manage Configuration -> Manage Columns # Also each user can configure their own columns using My Account -> Manage Columns - $g_excel_columns = array ( 'id', 'project_id', 'reporter_id', 'handler_id', 'priority', 'severity', 'reproducibility', 'version', 'projection', 'category', 'date_submitted', 'eta', 'os', 'os_build', 'platform', 'view_state', 'last_updated', 'summary', 'status', 'resolution', 'fixed_in_version' ); + $g_excel_columns = array ( 'id', 'project_id', 'reporter_id', 'handler_id', 'priority', 'severity', 'reproducibility', 'version', 'projection', 'category', 'date_submitted', 'eta', 'os', 'os_build', 'platform', 'view_state', 'last_updated', 'summary', 'status', 'resolution', 'fixed_in_version', 'votes_positive', 'votes_negative', 'votes_num_voters' ); # --- show projects when in All Projects mode --- $g_show_bug_project_links = ON; @@ -1423,6 +1423,7 @@ $g_db_table['mantis_config_table'] = '%db_table_prefix%_config%db_table_suffix%'; $g_db_table['mantis_database_table'] = '%db_table_prefix%_database%db_table_suffix%'; $g_db_table['mantis_email_table'] = '%db_table_prefix%_email%db_table_suffix%'; + $g_db_table['mantis_bug_votes_table'] = '%db_table_prefix%_bug_votes%db_table_suffix%'; ########################### # Mantis Enum Strings @@ -1989,6 +1990,36 @@ # management threshold. $g_manage_plugin_threshold = ADMINISTRATOR; + + ############################# + # Voting System + ############################# + + # enable or disable the whole voting feature. + $g_voting_enabled = ON; + + # access level required for users to vote on issues. + $g_voting_place_vote_threshold = REPORTER; + + # access level required for users to view the users who voted and their votes. + $g_voting_view_user_votes_threshold = DEVELOPER; + + # default number of votes allowed per user + $g_voting_default_num_votes = 10; # votes can be set for all user levels as an integer + $g_voting_default_num_votes = array( DEVELOPER => 25 , REPORTER => 10 ); # or you can set votes by user type, if a level is not specified then it will use the next lowest level available + + # default voting weights and thier labels, value needs to be integer, while key is a string eg: '+10 (Highly desired)' + $g_voting_weight_options = array('+1'=>1, '+2'=>2, '+5'=>5, '+10'=>10, '-1'=>-1, '-2'=>-2, '-5'=>-5, '-10'=>-10); + + # the maximum weight a user at a given level may use in a single vote + $g_voting_max_vote_weight = 5; #max vote weight can be an integer + $g_voting_max_vote_weight = array( DEVELOPER => 10 , REPORTER => 5 ); # or set by user type, eg: even though a reporter may have 10 votes, they may only use up to weight 5 in a single vote + + # voting weight that should be initially selected when casting a vote, usually the minimum positive vote + $g_voting_weight_default = 1; + + # whether you get your votes counted per project or globally, if ON then you will get $g_voting_default_num_votes per project, if it is OFF your votes are spread across all projects + $g_voting_per_project = ON; ############################# Index: core/bug_api.php =================================================================== --- core/bug_api.php (revision 5176) +++ core/bug_api.php (working copy) @@ -31,6 +31,7 @@ require_once( $t_core_dir . 'sponsorship_api.php' ); require_once( $t_core_dir . 'twitter_api.php' ); require_once( $t_core_dir . 'tag_api.php' ); + require_once( $t_core_dir . 'vote_api.php' ); # MASC RELATIONSHIP require_once( $t_core_dir.'relationship_api.php' ); @@ -67,6 +68,9 @@ var $summary = ''; var $sponsorship_total = 0; var $sticky = 0; + var $votes_positive = 0; + var $votes_negative = 0; + var $votes_num_voters = 0; # omitted: # var $bug_text_id @@ -791,6 +795,9 @@ # Delete all sponsorships sponsorship_delete( sponsorship_get_all_ids( $p_bug_id ) ); + + # Delete all votes on this bug + vote_delete_issue_votes( $p_bug_id ); # MASC RELATIONSHIP # we delete relationships even if the feature is currently off. Index: core/columns_api.php =================================================================== --- core/columns_api.php (revision 5176) +++ core/columns_api.php (working copy) @@ -51,6 +51,9 @@ 'selection', 'severity', 'sponsorship_total', + 'votes_positive', + 'votes_negative', + 'votes_num_voters', 'status', 'steps_to_reproduce', // new 'summary', @@ -822,4 +825,31 @@ echo ''; } + + + function print_column_title_votes_total( $p_sort, $p_dir, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) { + echo ''; + print_view_bug_sort_link( lang_get( 'vote_balance' ), 'votes_total', $p_sort, $p_dir, $p_columns_target ); + print_sort_icon( $p_dir, $p_sort, 'votes_total' ); + echo ''; + } + + function print_column_title_votes_num_voters( $p_sort, $p_dir, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) { + echo ''; + print_view_bug_sort_link( lang_get( 'vote_num_voters' ), 'votes_num_voters', $p_sort, $p_dir, $p_columns_target ); + print_sort_icon( $p_dir, $p_sort, 'votes_num_voters' ); + echo ''; + } + + function print_column_votes_total( $p_row, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) { + echo ''; + echo (($p_row['votes_total']>0)?'+':'') . $p_row['votes_total']; + echo ''; + } + + function print_column_votes_num_voters( $p_row, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) { + echo ''; + echo $p_row['votes_num_voters']; + echo ''; + } ?> Index: core/constant_inc.php =================================================================== --- core/constant_inc.php (revision 5176) +++ core/constant_inc.php (working copy) @@ -170,6 +170,8 @@ define( 'TAG_ATTACHED', 25 ); define( 'TAG_DETACHED', 26 ); define( 'TAG_RENAMED', 27 ); + define( 'BUGVOTE_ADDED', 28 ); + define( 'BUGVOTE_DELETED', 29 ); # bug relationship constants define( 'BUG_DUPLICATE', 0 ); @@ -335,6 +337,9 @@ # ERROR_COLUMNS_* define ( 'ERROR_COLUMNS_DUPLICATE', 2600 ); define ( 'ERROR_COLUMNS_INVALID', 2601 ); + + #ERROR_VOTING_* + define( 'ERROR_VOTING_NOT_ENABLED', 2700 ); # Status Legend Position define( 'STATUS_LEGEND_POSITION_TOP', 1); Index: core/csv_api.php =================================================================== --- core/csv_api.php (revision 5176) +++ core/csv_api.php (working copy) @@ -249,4 +249,16 @@ function csv_format_selection( $p_duplicate_id ) { return csv_escape_string( '' ); } + + function csv_format_votes_positive( $p_votes_positive ) { + return csv_escape_string( $p_votes_positive ); + } + + function csv_format_votes_negative( $p_votes_negative ) { + return csv_escape_string( $p_votes_negative ); + } + + function csv_format_votes_num_voters( $p_votes_num_voters ) { + return csv_escape_string( $p_votes_num_voters ); + } ?> Index: core/excel_api.php =================================================================== --- core/excel_api.php (revision 5176) +++ core/excel_api.php (working copy) @@ -423,4 +423,14 @@ // field is not linked to project return excel_prepare_string( '' ); } + + function excel_format_votes_positive( $p_votes_positive ) { + return excel_prepare_string( $p_votes_positive ); + } + function excel_format_votes_negative( $p_votes_negative ) { + return excel_prepare_string( $p_votes_negative ); + } + function excel_format_votes_num_voters( $p_votes_num_voters ) { + return excel_prepare_string( $p_votes_num_voters ); + } ?> \ No newline at end of file Index: core/filter_api.php =================================================================== --- core/filter_api.php (revision 5176) +++ core/filter_api.php (working copy) @@ -47,6 +47,7 @@ define( 'FILTER_PROPERTY_PRODUCT_BUILD', 'show_build' ); define( 'FILTER_PROPERTY_PRODUCT_VERSION', 'show_version' ); define( 'FILTER_PROPERTY_MONITOR_USER_ID', 'user_monitor' ); + define( 'FILTER_PROPERTY_VOTES_USER_ID', 'user_votes'); define( 'FILTER_PROPERTY_HIDE_STATUS_ID', 'hide_status' ); define( 'FILTER_PROPERTY_SORT_FIELD_NAME', 'sort' ); define( 'FILTER_PROPERTY_SORT_DIRECTION', 'dir' ); @@ -98,6 +99,7 @@ define( 'FILTER_SEARCH_OS', 'os' ); define( 'FILTER_SEARCH_OS_BUILD', 'os_build' ); define( 'FILTER_SEARCH_MONITOR_USER_ID', 'monitor_user_id' ); + define( 'FILTER_SEARCH_VOTES_USER_ID' , 'votes_user_id'); define( 'FILTER_SEARCH_PRODUCT_BUILD', 'product_build' ); define( 'FILTER_SEARCH_PRODUCT_VERSION', 'product_version' ); define( 'FILTER_SEARCH_VIEW_STATE_ID', 'view_state_id' ); @@ -203,6 +205,10 @@ if ( !filter_str_field_is_any( $p_custom_filter[FILTER_PROPERTY_MONITOR_USER_ID] ) ) { $t_query[] = filter_encode_field_and_value( FILTER_SEARCH_MONITOR_USER_ID, $p_custom_filter[FILTER_PROPERTY_MONITOR_USER_ID] ); } + + if ( !filter_str_field_is_any( $p_custom_filter[FILTER_PROPERTY_VOTES_USER_ID] ) ) { + $t_query[] = filter_encode_field_and_value( FILTER_PROPERTY_VOTES_USER_ID, $p_custom_filter[FILTER_PROPERTY_VOTES_USER_ID] ); + } if ( !filter_str_field_is_any( $p_custom_filter[FILTER_PROPERTY_HANDLER_ID] ) ) { $t_query[] = filter_encode_field_and_value( FILTER_SEARCH_HANDLER_ID, $p_custom_filter[FILTER_PROPERTY_HANDLER_ID] ); @@ -373,6 +379,7 @@ 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ), 'sort' => 'last_updated', 'dir' => 'DESC', 'per_page' => config_get( 'default_limit_view' ) @@ -418,6 +425,7 @@ $t_bugnote_text_table = db_get_table( 'mantis_bugnote_text_table' ); $t_project_table = db_get_table( 'mantis_project_table' ); $t_bug_monitor_table = db_get_table( 'mantis_bug_monitor_table' ); + $t_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); $t_limit_reporters = config_get( 'limit_reporters' ); $t_bug_relationship_table = db_get_table( 'mantis_bug_relationship_table' ); $t_report_bug_threshold = config_get( 'report_bug_threshold' ); @@ -1136,6 +1144,48 @@ array_push( $t_where_clauses, "( $t_table_name.user_id=" . db_param($t_where_param_count++). " )" ); } } + + # users voting on an issue + $t_select_clauses[] = '(votes_positive - votes_negative) as votes_total'; # @REVIEW is this the correct mantis way to be doing this? votes_total is a derived column + $t_any_found = false; + if ( count( $t_filter['user_votes'] ) == 0 ) { + $t_any_found = true; + } + else + { + foreach( $t_filter['user_votes'] as $t_filter_member ) { + if ( ( META_FILTER_ANY == $t_filter_member ) || ( 0 === $t_filter_member ) ) { + $t_any_found = true; + } + } + } + if ( !$t_any_found ) { + $t_clauses = array(); + $t_table_name = 'user_votes'; + array_push( $t_from_clauses, $t_bug_votes_table ); + array_push( $t_join_clauses, "LEFT JOIN $t_bug_votes_table $t_table_name ON $t_table_name.issue_id = $t_bug_table.id" ); + + foreach( $t_filter['user_votes'] as $t_filter_member ) { + $c_user_monitor = db_prepare_int( $t_filter_member ); + if ( META_FILTER_MYSELF == $c_user_monitor ) { + array_push( $t_clauses, $c_user_id ); + } else { + array_push( $t_clauses, $c_user_monitor ); + } + } + if ( 1 < count( $t_clauses ) ) { + foreach( $t_clauses as $t_clause ) { + $t_where_tmp[] = db_param($t_where_param_count++); + $t_where_params[] = $t_clause; + } + array_push( $t_where_clauses, "( $t_table_name.user_id in (". implode( ', ', $t_where_tmp ) .") )" ); + } else { + $t_where_params[] = $t_clauses[0]; + array_push( $t_where_clauses, "( $t_table_name.user_id=" . db_param($t_where_param_count++). " )" ); + } + } + + # bug relationship $t_any_found = false; $c_rel_type = $t_filter['relationship_type']; @@ -1375,7 +1425,7 @@ $t_id_join $t_id_where"; $t_query_params = array(); - + if ( ( $i == 0 ) || ( !is_blank( $t_filter['search'] ) ) ) { if( $i == 0) { $q1 = "SELECT DISTINCT $t_bug_table.id AS id" . $query; @@ -2485,9 +2535,12 @@ : - + : + + : + 8 ) { echo ' '; } ?> @@ -2508,7 +2561,7 @@ print_multivalue_field( FILTER_PROPERTY_OS_BUILD, $t_filter[FILTER_PROPERTY_OS_BUILD] ); ?> - + + + + + '; + } else { + $t_first_flag = false; + } + $t_output = $t_output . $t_this_name; + } + if ( true == $t_any_found ) { + PRINT lang_get( 'any' ); + } else { + PRINT $t_output; + } + } + ?> + 'string', 'target_version' => 'string', 'user_monitor' => 'int', + 'user_votes' => 'int', 'show_profile' => 'int' ); foreach( $t_multi_select_list as $t_multi_field_name => $t_multi_field_type ) { @@ -3441,6 +3534,24 @@ + + + ' . $p_new_value; break; + case BUGVOTE_ADDED: + $t_note = lang_get( 'bugvote_added' ) . ": " . $p_old_value; + break; + case BUGVOTE_DELETED: + $t_note = lang_get( 'bugvote_deleted' ) . ": " . $p_old_value; + break; } } Index: core/html_api.php =================================================================== --- core/html_api.php (revision 5176) +++ core/html_api.php (working copy) @@ -70,6 +70,7 @@ require_once( $t_core_dir . 'user_api.php' ); require_once( $t_core_dir . 'rss_api.php' ); require_once( $t_core_dir . 'wiki_api.php' ); + require_once( $t_core_dir . 'vote_api.php' ); $g_rss_feed_url = null; @@ -842,6 +843,7 @@ $t_account_prefs_page = 'account_prefs_page.php'; $t_account_profile_menu_page = 'account_prof_menu_page.php'; $t_account_sponsor_page = 'account_sponsor_page.php'; + $t_account_voting_page = 'account_voting_page.php'; $t_account_manage_columns_page = 'account_manage_columns_page.php'; switch ( $p_page ) { @@ -857,6 +859,9 @@ case $t_account_sponsor_page: $t_account_sponsor_page = ''; break; + case $t_account_voting_page: + $t_account_voting_page = ''; + break; case $t_account_manage_columns_page: $t_account_manage_columns_page = ''; break; @@ -875,6 +880,13 @@ !current_user_is_anonymous() ) { print_bracket_link( helper_mantis_url( $t_account_sponsor_page ), lang_get( 'my_sponsorship' ) ); } + + if ( ( config_get( 'voting_enabled' ) == ON ) && + ( access_has_project_level( config_get( 'voting_place_vote_threshold' ) ) ) && + !current_user_is_anonymous() ) { + print_bracket_link( helper_mantis_url( $t_account_voting_page ), lang_get( 'my_votes' ) ); + } + } # -------------------- @@ -1277,7 +1289,7 @@ echo ''; html_button_bug_change_status( $p_bug_id ); echo ''; - + # MONITOR/UNMONITOR button echo ''; if ( !current_user_is_anonymous() ) { Index: core/my_view_inc.php =================================================================== --- core/my_view_inc.php (revision 5176) +++ core/my_view_inc.php (working copy) @@ -59,7 +59,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_bug_resolved_status_threshold ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['assigned'] = 'handler_id=' . $t_current_user_id . '&hide_status=' . $t_bug_resolved_status_threshold; @@ -74,7 +75,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => META_FILTER_NONE ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['recent_mod'] = 'hide_status=none'; @@ -90,7 +92,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['reported'] = 'reporter_id=' . $t_current_user_id . '&hide_status=' . $t_hide_status_default; @@ -105,7 +108,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['resolved'] = 'show_status=' . $t_bug_resolved_status_threshold . '&hide_status=' . $t_bug_resolved_status_threshold; @@ -120,7 +124,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['unassigned'] = 'handler_id=[none]' . '&hide_status=' . $t_hide_status_default; @@ -135,7 +140,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => $t_current_user_id ) + 'user_monitor' => Array ( '0' => $t_current_user_id ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['monitored'] = 'user_monitor=' . $t_current_user_id . '&hide_status=' . $t_hide_status_default; @@ -151,7 +157,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['feedback'] = 'reporter_id=' . $t_current_user_id . '&show_status=' . FEEDBACK . '&hide_status=' . $t_hide_status_default; @@ -166,7 +173,8 @@ 'show_build' => Array ( '0' => META_FILTER_ANY ), 'show_version' => Array ( '0' => META_FILTER_ANY ), 'hide_status' => Array ( '0' => $t_hide_status_default ), - 'user_monitor' => Array ( '0' => META_FILTER_ANY ) + 'user_monitor' => Array ( '0' => META_FILTER_ANY ), + 'user_votes' => Array ( '0' => META_FILTER_ANY ) ); $url_link_parameters['verify'] = 'reporter_id=' . $t_current_user_id . '&show_status=' . $t_bug_resolved_status_threshold; Index: core/user_api.php =================================================================== --- core/user_api.php (revision 5176) +++ core/user_api.php (working copy) @@ -25,6 +25,7 @@ require_once( $t_core_dir . 'email_api.php' ); require_once( $t_core_dir . 'ldap_api.php' ); + require_once( $t_core_dir . 'vote_api.php' ); ### User API ### @@ -551,6 +552,9 @@ $t_user_table = db_get_table('mantis_user_table'); user_ensure_unprotected( $p_user_id ); + + # Remove any votes the user has made on issues + vote_delete_user_votes( $p_user_id ); # Remove associated profiles user_delete_profiles( $p_user_id ); @@ -1077,7 +1081,6 @@ } $t_filter = unserialize( $t_cookie_detail[1] ); - $t_filter = filter_ensure_valid_filter( $t_filter ); return $t_filter; Index: core/vote_api.php =================================================================== --- core/vote_api.php (revision 0) +++ core/vote_api.php (revision 0) @@ -0,0 +1,350 @@ + $t_vote_max_weight || $p_weight == 0 ) + { + return false; # not allowed to vote more than your limit, or have a vote with weight 0 + } + + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + + $query = "INSERT INTO $t_mantis_bug_votes_table + ( issue_id, user_id, weight ) + VALUES + ( " . db_param(0) . ", " . db_param(1) . ", " . db_param(2) . " )"; + db_query_bound( $query, Array( (int)$p_issue_id, (int)$p_user_id, (int)$p_weight ) ); + + # get bugvote id + $t_bugvote_id = db_insert_id( $t_mantis_bug_votes_table ); + + + if ($p_weight >= 1) { + $t_existing_positive_votes = bug_get_field($p_issue_id,'votes_positive'); + bug_set_field($p_issue_id, 'votes_positive', $t_existing_positive_votes + $p_weight ); + } + else if ($p_weight <= -1) { + $t_existing_negative_votes = bug_get_field($p_issue_id,'votes_negative'); + bug_set_field($p_issue_id, 'votes_negative', $t_existing_negative_votes - $p_weight); + } + $t_existing_num_voters = bug_get_field($p_issue_id, 'votes_num_voters'); + bug_set_field($p_issue_id, 'votes_num_voters', $t_existing_num_voters + 1); + + # log vote history + $t_weight_log = ($p_weight>=1)?('+'.$p_weight):$p_weight; + history_log_event_special( $p_issue_id, BUGVOTE_ADDED, $t_weight_log ); + bug_update_date($p_issue_id); + + return true; +} + +/** + * vote_delete + * should only delete your vote if the bug has not been closed or resolved + * + * @param int $p_issue_id + * @param int $p_user_id + * @return null + */ +function vote_delete( $p_issue_id, $p_user_id ) +{ + if ($p_issue_id < 1 || $p_user_id < 1){return;} + + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + + # decrement vote counts from bugs table, get weight used for vote so we can remove the correct weighting from the summary + $query = "SELECT weight FROM $t_mantis_bug_votes_table WHERE issue_id = " . db_param(0) . " AND user_id = " . db_param(1); + $result = db_query_bound( $query, Array( $p_issue_id, $p_user_id ) ); + $t_weight = $result->fields['weight']; + + if ($t_weight >= 1) { + $t_existing_positive_votes = bug_get_field( $p_issue_id , 'votes_positive' ); + bug_set_field( $p_issue_id , 'votes_positive' , $t_existing_positive_votes - $t_weight ); + } + else if ($t_weight <= -1) { + $t_existing_negative_votes = bug_get_field( $p_issue_id , 'votes_negative' ); + bug_set_field($p_issue_id, 'votes_negative', $t_existing_negative_votes + $t_weight ); + } + $t_existing_num_voters = bug_get_field($p_issue_id, 'votes_num_voters'); + bug_set_field($p_issue_id, 'votes_num_voters', $t_existing_num_voters - 1); + + # now remove all votes from voting table + $query = "DELETE FROM $t_mantis_bug_votes_table WHERE issue_id = " . db_param(0) . " AND user_id = " . db_param(1); + db_query_bound($query, Array( (int)$p_issue_id, (int)$p_user_id )); + + # log vote history + $t_weight_log = ($t_weight>=1)?('+'.$t_weight):$t_weight; + history_log_event_special( $p_issue_id, BUGVOTE_DELETED, $t_weight_log ); + bug_update_date($p_issue_id); +} + +/** + * vote_delete_issue_votes + * Deleting an issue should delete all associated votes. + * + * @param int $p_issue_id issue primary key + * @return null + */ +function vote_delete_issue_votes( $p_issue_id ) +{ + if ($p_issue_id < 1){return;} + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + $query = "DELETE FROM $t_mantis_bug_votes_table WHERE issue_id = " . db_param(0); + db_query_bound($query, Array( (int)$p_issue_id )); +} + +/** + * vote_delete_user_votes + * Deleting a user should delete all associated votes. + * + * @param int $p_user_id user primary key + * @return null + */ +function vote_delete_user_votes( $p_user_id ) +{ + if ($p_user_id < 1){return;} + $votes = vote_get_user_votes( $p_user_id ); + foreach($votes as $vote) + { + vote_delete($vote['issue_id'], $p_user_id); + } +} + +/** + * vote_get_user_votes + * + * @param int $p_user_id + * @param int $p_project_id + * @return array issues and thier weight array('issue_id'=>$p_issue_id, 'weight'=>$p_weight); + */ +function vote_get_user_votes ( $p_user_id, $p_project_id = null, $p_include_resolved = true ) +{ + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + + $query = "SELECT issue_id, weight FROM $t_mantis_bug_votes_table WHERE user_id = " . db_param(0); + $result = db_query_bound($query, Array($p_user_id)); + + $users = array(); + while ( $row = db_fetch_array( $result ) ) { + + $t_resolved = bug_is_resolved($row['issue_id']); + + if ($p_include_resolved || !$t_resolved ) + { + if ( $p_project_id === null ) + { + $users[] = $row; + } + else + { + $t_issue_project = bug_get_field($row['issue_id'], 'project_id'); + if ( $t_issue_project == $p_project_id ) + { + $users[] = $row; + } + } + } + } + return $users; +} + +/** + * vote_get_issue_votes + * returns an array of user ids, weight + * + * @param int $p_issue_id issue primary key + * @return array users and thier vote weight array('user_id'=>$p_user_id, 'weight'=>$p_weight); + */ +function vote_get_issue_votes( $p_issue_id ) +{ + if ($p_issue_id < 1){return;} + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + $query = "SELECT user_id, weight FROM $t_mantis_bug_votes_table WHERE issue_id = " . db_param(0); + $result = db_query_bound($query, Array($p_issue_id)); + $t_issue_votes = array(); + while ( $row = db_fetch_array( $result ) ) { + $t_issue_votes[] = $row; + } + return $t_issue_votes; +} + +/** + * vote_is_enabled + * + * @param int $p_project_id + * @return bool + */ +function vote_is_enabled( $p_project_id = ALL_PROJECTS ) +{ + $t_enabled = ( config_get( 'voting_enabled', null, null, $p_project_id ) == ON ); + return $t_enabled; +} + +/** + * vote_can_vote + * whether or not the user is allowed to vote on an issue + * + * @param int $p_issue_id + * @param int $p_user_id + * @return bool + */ +function vote_can_vote( $p_issue_id, $p_user_id = null ) +{ + $t_can_vote = ( !bug_is_readonly( $p_issue_id ) && access_has_bug_level( config_get( 'voting_place_vote_threshold' ),$p_issue_id , $p_user_id ) ); + return $t_can_vote; +} + +/** + * vote_can_view_vote_details + * whether or not the user is allowed to view vote details + * + * @param int $p_issue_id + * @param int $p_user_id + * @return bool + */ +function vote_can_view_vote_details( $p_issue_id, $p_user_id = null ) +{ + $t_has_level = ( access_has_bug_level( config_get( 'voting_view_user_votes_threshold' ), $p_issue_id , $p_user_id ) ); + return $t_has_level; +} + +/** + * vote_exists + * whether the user has placed a vote on a given issue or not + * @param int $p_issue_id + * @param int $p_user_id + * @return bool + */ +function vote_exists ( $p_issue_id, $p_user_id) +{ + $t_mantis_bug_votes_table = db_get_table( 'mantis_bug_votes_table' ); + $query = "SELECT COUNT(*) + FROM $t_mantis_bug_votes_table + WHERE issue_id=" . db_param(0) . " AND user_id = " . db_param(1); + $result = db_query_bound( $query, Array( $p_issue_id, $p_user_id ) ); + + if ( 0 == db_result( $result ) ) { + return false; + } else { + return true; + } +} + +/** + * vote_max_votes + * the maximum number of votes the given user can cast across all issues + * @param int $p_user_id + * @return int + */ +function vote_max_votes( $p_user_id ) +{ + $t_default_num_votes = config_get('voting_default_num_votes',10); #defaults to 10 votes + + if (is_array($t_default_num_votes)) + { + ksort($t_default_num_votes); # relies on user levels being numeric + $t_user_level = user_get_access_level( $p_user_id ); + foreach($t_default_num_votes as $t_vote_level => $t_votes) + { + if ($t_user_level >= $t_vote_level) + { + $t_default_num_votes = $t_votes; + } + } + } + return $t_default_num_votes; +} + +/** + * vote_available_votes + * the number of available votes a user can still cast + * @param int $p_user_id + * @param int $p_project_id + * @return int + */ +function vote_available_votes( $p_user_id, $p_project_id = null ) +{ + return (vote_max_votes( $p_user_id )) - (vote_used_votes( $p_user_id, $p_project_id )); +} + +/** + * vote_used_votes + * the number of votes already cast on a given project that are not resolved + * @param int $p_user_id + * @param int $p_project_id + * @return int + */ +function vote_used_votes( $p_user_id, $p_project_id = null ) +{ + $t_per_project = config_get('voting_per_project', ON); + if ($t_per_project == ON) + { + $t_votes = vote_get_user_votes( $p_user_id, $p_project_id, false ); + } + else + { + $t_votes = vote_get_user_votes( $p_user_id, null, false ); + } + + $t_weight_used = 0; + foreach($t_votes as $t_vote) + { + if ($t_vote['weight']>0) + { + $t_weight_used += $t_vote['weight']; + } + else + { + $t_weight_used -= $t_vote['weight']; + } + } + return $t_weight_used; +} + +/** + * vote_max_weight + * the maximum weight a user can cast on a single vote right now - note this is different from vote_available_votes + * takes in to consideration how many votes a user has remaining + * returning whichever is the lesser, your available votes or you max vote weight + * @param int $p_user_id + * @param int $p_project_id + * @return int + */ +function vote_max_weight( $p_user_id, $p_project_id ) +{ + $t_available_votes = vote_available_votes( $p_user_id, $p_project_id ); + $t_voting_max_vote_weight = config_get('voting_max_vote_weight', 5); + if (is_array($t_voting_max_vote_weight)) + { + ksort($t_voting_max_vote_weight); # relies on user levels being numeric + $t_user_level = user_get_access_level( $p_user_id ); + foreach($t_voting_max_vote_weight as $t_max) + { + if ($t_user_level >= $t_max) + { + $t_voting_max_vote_weight = $t_max; + } + } + } + # return whichever is the lesser, your available votes or you max vote weight + $t_voting_max_vote_weight = ($t_available_votes > $t_voting_max_vote_weight)?$t_voting_max_vote_weight:$t_available_votes; + return $t_voting_max_vote_weight; +} +?> \ No newline at end of file Property changes on: core\vote_api.php ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: css/default.css =================================================================== --- css/default.css (revision 5176) +++ css/default.css (working copy) @@ -163,3 +163,28 @@ .progress400 { position: relative; width: 400px; border: 1px solid #d7d7d7; margin-top: 1em; margin-bottom: 1em; padding: 1px; } .progress400 .bar { display: block; position: relative; background: #6bba70; text-align: center; font-weight: normal; color: #333; height: 2em; line-height: 2em; } + +table.bugList +{ + width: 100%; border: solid 1px #000; + margin:0; + margin-bottom: 16px; + caption-side: top; + +} +table.bugList caption +{ + font-weight:bold; + font-style:italic; + text-align:left; + border: 1px solid #000; + border-bottom:0; + padding: 4px; + margin-top:16px; +} +table.bugList tfoot tr td +{ + background-color: #ccc; + text-align: right; +} + Index: lang/strings_english.txt =================================================================== --- lang/strings_english.txt (revision 5176) +++ lang/strings_english.txt (working copy) @@ -637,6 +637,7 @@ # bug_vote_add.php $s_vote_added_msg = 'Vote has been added...'; +$s_vote_removed_msg = 'Vote has been removed...'; # bugnote_add.php $s_bugnote_added_msg = 'Note added...'; @@ -1513,6 +1514,29 @@ $s_copy_columns_from = 'Copy Columns From'; $s_copy_columns_to = 'Copy Columns To'; +# Voting +$s_vote_cast_button = 'Cast Vote:'; +$s_vote_delete_button = 'Delete My Vote'; +$s_bugvote_added = 'Vote Added'; +$s_bugvote_deleted = 'Vote Deleted'; +$s_votes_positive = 'Votes Positive'; +$s_votes_negative = 'Votes Negative'; +$s_voted_by = 'Voted By'; +$s_vote_balance = 'Vote Balance'; +$s_vote_num_voters = '# Voters'; +$s_votes_remain = 'votes remaining'; +$s_votes_used = 'votes used'; +$s_voting_this_issue = 'Users voting for this issue'; +$s_votes_num_voters = 'Number of Voters'; +$s_my_votes = 'My Votes'; +$s_own_voted = 'Issues you have voted for:'; +$s_voting_hide = 'Hide Resolved'; +$s_voting_show = 'Show All'; +$s_vote_weight = 'Vote Weight'; +$s_no_votes = 'No votes available'; +$s_voted_and_assigned = 'You voted for this issue and it is now being worked on. You will be able to reuse the voting credits you spent on this issue once it is resolved.'; +$s_voted_and_resolved = 'You voted for this issue, and it is now resolved. Your voting credits have been returned to you.'; + # due date $s_due_date = "Due Date"; $s_overdue = "Overdue"; Index: view_all_set.php =================================================================== --- view_all_set.php (revision 5176) +++ view_all_set.php (working copy) @@ -190,6 +190,14 @@ $f_user_monitor = gpc_get_string( 'user_monitor', META_FILTER_ANY ); $f_user_monitor = array( $f_user_monitor ); } + + $f_user_votes = array(); + if ( is_array( gpc_get( 'user_votes', null ) ) ) { + $f_user_votes = gpc_get_string_array( 'user_votes', META_FILTER_ANY ); + } else { + $f_user_votes = gpc_get_string( 'user_votes', META_FILTER_ANY ); + $f_user_votes = array( $f_user_votes ); + } # these are only single values, even when doing advanced filtering $f_per_page = gpc_get_int( 'per_page', -1 ); @@ -420,6 +428,7 @@ $t_setting_arr['target_version'] = $f_target_version; $t_setting_arr['show_priority'] = $f_show_priority; $t_setting_arr['user_monitor'] = $f_user_monitor; + $t_setting_arr['user_votes'] = $f_user_votes; $t_setting_arr['view_state'] = $f_view_state; $t_setting_arr['custom_fields'] = $f_custom_fields_data; $t_setting_arr['sticky_issues'] = $f_sticky_issues; @@ -472,6 +481,7 @@ $t_setting_arr['fixed_in_version'] = array( META_FILTER_ANY ); $t_setting_arr['target_version'] = array( META_FILTER_ANY ); $t_setting_arr['user_monitor'] = array( META_FILTER_ANY ); + $t_setting_arr['user_votes'] = array( META_FILTER_ANY ); $t_setting_arr['relationship_type'] = -1; $t_setting_arr['relationship_bug'] = 0;