From: Victor B. <vb...@us...> - 2006-04-25 13:18:37
|
Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10141 Modified Files: config_defaults_inc.php issues_rss.php main_page.php news_rss.php query_view_page.php Log Message: Fixed #6987: Add $g_rss_enabled configuration option Index: issues_rss.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/issues_rss.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- issues_rss.php 23 Apr 2006 12:32:58 -0000 1.7 +++ issues_rss.php 25 Apr 2006 13:18:27 -0000 1.8 @@ -34,6 +34,11 @@ $f_username = gpc_get_string( 'username', null ); $f_key = gpc_get_string( 'key', null ); + # make sure RSS syndication is enabled. + if ( OFF == config_get( 'rss_enabled' ) ) { + access_denied(); + } + # authenticate the user if ( $f_username !== null ) { if ( !rss_login( $f_username, $f_key ) ) { Index: news_rss.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/news_rss.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- news_rss.php 23 Apr 2006 12:32:58 -0000 1.10 +++ news_rss.php 25 Apr 2006 13:18:27 -0000 1.11 @@ -24,6 +24,11 @@ $f_key = gpc_get_string( 'key', null ); $f_project_id = gpc_get_int( 'project_id', ALL_PROJECTS ); + # make sure RSS syndication is enabled. + if ( OFF == config_get( 'rss_enabled' ) ) { + access_denied(); + } + # authenticate the user if ( $f_username !== null ) { if ( !rss_login( $f_username, $f_key ) ) { Index: config_defaults_inc.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v retrieving revision 1.298 retrieving revision 1.299 diff -u -d -r1.298 -r1.299 --- config_defaults_inc.php 25 Apr 2006 12:01:06 -0000 1.298 +++ config_defaults_inc.php 25 Apr 2006 13:18:27 -0000 1.299 @@ -1570,6 +1570,10 @@ # RSS Feeds ###################### + # This flag enables or disables RSS syndication. In the case where RSS syndication is not used, + # it is recommended to set it to OFF. + $g_rss_enabled = ON; + # This seed is used as part of the inputs for calculating the authentication key for the RSS feeds. # If this seed changes, all the existing keys for the RSS feeds will become invalid. This is # defaulted to the database user name, but it is recommended to overwrite it with a specific value Index: main_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/main_page.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- main_page.php 23 Apr 2006 12:32:58 -0000 1.58 +++ main_page.php 25 Apr 2006 13:18:27 -0000 1.59 @@ -25,10 +25,15 @@ access_ensure_project_level( VIEWER ); $f_offset = gpc_get_int( 'offset', 0 ); - + $t_project_id = helper_get_current_project(); - $t_rss_link = rss_get_news_feed_url( $t_project_id ); - html_set_rss_link( $t_rss_link ); + + $t_rss_enabled = config_get( 'rss_enabled' ); + + if ( OFF != $t_rss_enabled ) { + $t_rss_link = rss_get_news_feed_url( $t_project_id ); + html_set_rss_link( $t_rss_link ); + } html_page_top1(); html_page_top2(); @@ -86,7 +91,9 @@ print_bracket_link( 'main_page.php?offset=' . $f_offset_next, lang_get( 'older_news_link' ) ); } - print_bracket_link( $t_rss_link, lang_get( 'rss' ) ); + if ( OFF != $t_rss_enabled ) { + print_bracket_link( $t_rss_link, lang_get( 'rss' ) ); + } echo '</div>'; Index: query_view_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/query_view_page.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- query_view_page.php 23 Apr 2006 12:32:58 -0000 1.6 +++ query_view_page.php 25 Apr 2006 13:18:27 -0000 1.7 @@ -33,6 +33,8 @@ $t_use_query_url = 'view_all_set.php?type=3&source_query_id='; $t_delete_query_url = 'query_delete_page.php?source_query_id='; + + $t_rss_enabled = config_get( 'rss_enabled' ); ?> <br /> <div align="center"> @@ -48,9 +50,12 @@ print '<td>'; - # Use the "new" RSS link style. - print_rss( rss_get_issues_feed_url( null, null, $t_id ), lang_get( 'rss' ) ); - echo ' '; + if ( OFF != $t_rss_enabled ) { + # Use the "new" RSS link style. + print_rss( rss_get_issues_feed_url( null, null, $t_id ), lang_get( 'rss' ) ); + echo ' '; + } + print '<a href="' . $t_use_query_url . db_prepare_int( $t_id ) . '">' . string_display( $t_name ) . '</a>'; if ( filter_db_can_delete_filter( $t_id ) ) { |