Menu
▾
▴
[mantisbt-commits] mantisbt.git branch, master-1.2.x, updated. release-1.2.0rc1-148-gcdfb58e
|
From: <gi...@ma...> - 2009-07-22 02:02:04
|
The branch, master-1.2.x has been updated
via cdfb58e73768e44e08891cbfb8e2658481e7fb15 (commit)
via 624fafd6c903e7c34cc1165603e8c2a5588ac155 (commit)
via f6a7b45b6d6f9897e7790f89c4c99c4d3e67ab26 (commit)
via d375252e9200beaf12046a74060b91a8a6bc907d (commit)
via c81216ab38cd5c1bf669add2170b63650c0af2d6 (commit)
via 686bb5ff9bba27894d191c4f2547335770aff13b (commit)
from e1afe107c1bb9340ccb4818880b1809b28b231b2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdfb58e73768e44e08891cbfb8e2658481e7fb15
Author: Paul Richards <pa...@ma...>
Date: Tue Jul 21 23:41:06 2009 +0100
Fix: 0010747: User summary enhancement for billing page
commit 624fafd6c903e7c34cc1165603e8c2a5588ac155
Author: Paul Richards <pa...@ma...>
Date: Sat Jul 18 23:08:35 2009 +0100
We dont use __FILE__ param of html_page_bottom. Note: someone who were to overload this function could use a version SERVER["SCRIPTNAME"] to retrieve the requested page name.
commit f6a7b45b6d6f9897e7790f89c4c99c4d3e67ab26
Author: Paul Richards <pa...@ma...>
Date: Tue Jul 14 00:14:21 2009 +0100
Update columns api so that columns_get_standard and columns_filter_disabled implement similar filtering.
commit d375252e9200beaf12046a74060b91a8a6bc907d
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:27:41 2009 +0100
compress_api.php is included by core.php
commit c81216ab38cd5c1bf669add2170b63650c0af2d6
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:27:06 2009 +0100
Fix a couple of html errors introduced
commit 686bb5ff9bba27894d191c4f2547335770aff13b
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:26:53 2009 +0100
Check if config string is empty before going around preg loop
-----------------------------------------------------------------------
Summary of changes:
account_delete.php | 2 +-
account_manage_columns_page.php | 2 +-
account_page.php | 8 +-
account_prefs_page.php | 2 +-
account_prefs_update.php | 2 +-
account_prof_edit_page.php | 4 +-
account_prof_menu_page.php | 2 +-
account_sponsor_page.php | 2 +-
account_sponsor_update.php | 2 +-
account_update.php | 2 +-
adm_config_report.php | 2 +-
adm_permissions_report.php | 2 +-
admin/index.php | 2 +-
admin/system_utils.php | 2 +-
admin/test_email.php | 2 +-
admin/test_icons.php | 2 +-
admin/test_langs.php | 2 +-
billing_inc.php | 56 +++++++++++++++
billing_page.php | 2 +-
bug_actiongroup.php | 2 +-
bug_actiongroup_ext.php | 2 +-
bug_file_add.php | 2 +-
bug_relationship_graph.php | 2 +-
bug_reminder.php | 2 +-
bug_report.php | 2 +-
bug_report_advanced_page.php | 3 +-
bug_report_page.php | 2 +-
bug_revision_view_page.php | 2 +-
bug_update_advanced_page.php | 2 +-
bug_view_inc.php | 7 +-
bugnote_edit_page.php | 2 +-
changelog_page.php | 2 +-
core/bug_group_action_api.php | 2 +-
core/columns_api.php | 72 +++++++++++---------
core/config_api.php | 2 +-
core/html_api.php | 4 +-
login_select_proj_page.php | 2 +-
main_page.php | 2 +-
manage_config_columns_page.php | 2 +-
manage_config_columns_reset.php | 2 +-
manage_config_columns_set.php | 2 +-
manage_config_email_page.php | 2 +-
manage_config_email_set.php | 2 +-
manage_config_revert.php | 2 +-
manage_config_work_threshold_page.php | 2 +-
manage_config_work_threshold_set.php | 2 +-
manage_config_workflow_page.php | 2 +-
manage_config_workflow_set.php | 2 +-
manage_custom_field_create.php | 2 +-
manage_custom_field_delete.php | 2 +-
manage_custom_field_edit_page.php | 2 +-
manage_custom_field_page.php | 2 +-
manage_custom_field_update.php | 2 +-
manage_overview_page.php | 2 +-
manage_proj_cat_delete.php | 2 +-
manage_proj_cat_edit_page.php | 2 +-
manage_proj_cat_update.php | 2 +-
manage_proj_create.php | 2 +-
manage_proj_create_page.php | 2 +-
manage_proj_custom_field_add_existing.php | 2 +-
manage_proj_custom_field_remove.php | 2 +-
manage_proj_custom_field_update.php | 2 +-
manage_proj_edit_page.php | 2 +-
manage_proj_page.php | 2 +-
manage_proj_subproj_add.php | 2 +-
manage_proj_subproj_delete.php | 2 +-
manage_proj_user_remove.php | 2 +-
manage_proj_ver_add.php | 2 +-
manage_proj_ver_delete.php | 2 +-
manage_proj_ver_edit_page.php | 2 +-
manage_proj_ver_update.php | 2 +-
manage_tags_page.php | 2 +-
manage_user_create.php | 2 +-
manage_user_create_page.php | 2 +-
manage_user_delete.php | 2 +-
manage_user_edit_page.php | 2 +-
manage_user_page.php | 2 +-
manage_user_proj_delete.php | 2 +-
manage_user_reset.php | 2 +-
manage_user_update.php | 2 +-
my_view_page.php | 2 +-
news_add.php | 2 +-
news_edit_page.php | 2 +-
news_list_page.php | 2 +-
news_menu_page.php | 2 +-
news_update.php | 2 +-
news_view_page.php | 2 +-
permalink_page.php | 2 +-
plugins/MantisCoreFormatting/pages/config.php | 2 +-
plugins/MantisGraph/pages/bug_graph_page.php | 2 +-
plugins/MantisGraph/pages/config.php | 2 +-
.../pages/summary_graph_imp_category.php | 2 +-
.../pages/summary_graph_imp_priority.php | 2 +-
.../pages/summary_graph_imp_resolution.php | 2 +-
.../pages/summary_graph_imp_severity.php | 2 +-
.../MantisGraph/pages/summary_graph_imp_status.php | 2 +-
plugins/MantisGraph/pages/summary_jpgraph_page.php | 2 +-
plugins/XmlImportExport/pages/import.php | 2 +-
plugins/XmlImportExport/pages/import_action.php | 2 +-
print_all_bug_options_page.php | 2 +-
print_all_bug_options_reset.php | 2 +-
print_all_bug_options_update.php | 2 +-
proj_doc_add.php | 2 +-
proj_doc_add_page.php | 2 +-
proj_doc_delete.php | 2 +-
proj_doc_edit_page.php | 2 +-
proj_doc_page.php | 2 +-
proj_doc_update.php | 2 +-
project_page.php | 2 +-
query_delete.php | 2 +-
query_delete_page.php | 2 +-
query_store_page.php | 2 +-
query_view_page.php | 2 +-
roadmap_page.php | 2 +-
set_project.php | 2 +-
summary_page.php | 2 +-
tag_attach.php | 2 +-
tag_update_page.php | 2 +-
tag_view_page.php | 2 +-
view_all_bug_page.php | 2 +-
view_filters_page.php | 2 +-
view_user_page.php | 2 +-
122 files changed, 222 insertions(+), 162 deletions(-)
-----------------------------------------------------------------------
commit cdfb58e73768e44e08891cbfb8e2658481e7fb15
Author: Paul Richards <pa...@ma...>
Date: Tue Jul 21 23:41:06 2009 +0100
Fix: 0010747: User summary enhancement for billing page
diff --git a/billing_inc.php b/billing_inc.php
index 321aed1..84b88fd 100644
--- a/billing_inc.php
+++ b/billing_inc.php
@@ -145,9 +145,11 @@ if ( !is_blank( $f_get_bugnote_stats_button ) ) {
</tr>
<?php
$t_sum_in_minutes = 0;
+ $t_user_summary = array();
foreach ( $t_bugnote_stats as $t_item ) {
$t_sum_in_minutes += $t_item['sum_time_tracking'];
+ $t_user_summary[$t_item['username']] += $t_item['sum_time_tracking'];
$t_item['sum_time_tracking'] = db_minutes_to_hhmm( $t_item['sum_time_tracking'] );
if ( $t_item['bug_id'] != $t_prev_id) {
@@ -178,6 +180,60 @@ if ( !is_blank( $f_get_bugnote_stats_button ) ) {
<td class="small-caption">
<?php echo db_minutes_to_hhmm( $t_sum_in_minutes ); ?>
</td>
+ <?php if ($t_cost_col) { ?>
+ <td>
+ <?php echo string_attribute( number_format( $t_sum_in_minutes * $f_bugnote_cost / 60, 2 ) ); ?>
+ </td>
+ <?php } ?>
+</tr>
+</table>
+
+<br />
+<br />
+
+<table border="0" class="width100" cellspacing="0">
+<tr class="row-category-history">
+ <td class="small-caption">
+ <?php echo lang_get( 'username' ) ?>
+ </td>
+ <td class="small-caption">
+ <?php echo lang_get( 'time_tracking' ) ?>
+ </td>
+<?php if ( $t_cost_col) { ?>
+ <td class="small-caption">
+ <?php echo lang_get( 'time_tracking_cost' ) ?>
+ </td>
+<?php } ?>
+</tr>
+<?php
+ foreach ( $t_user_summary as $t_username => $t_total_time ) {
+?>
+<tr <?php echo helper_alternate_class() ?>>
+ <td class="small-caption">
+ <?php echo $t_username; ?>
+ </td>
+ <td class="small-caption">
+ <?php echo db_minutes_to_hhmm($t_total_time); ?>
+ </td>
+<?php if ($t_cost_col) { ?>
+ <td>
+ <?php echo string_attribute( number_format( $t_total_time * $f_bugnote_cost / 60, 2 ) ); ?>
+ </td>
+<?php } ?>
+</tr>
+<?php } ?>
+<tr <?php echo helper_alternate_class() ?>>
+ <td class="small-caption">
+ <?php echo lang_get( 'total_time' ); ?>
+ </td>
+ <td class="small-caption">
+ <?php echo db_minutes_to_hhmm( $t_sum_in_minutes ); ?>
+ </td>
+<?php if ($t_cost_col) { ?>
+ <td>
+ <?php echo string_attribute( number_format( $t_sum_in_minutes * $f_bugnote_cost / 60, 2 ) ); ?>
+ </td>
+<?php } ?>
</tr>
</table>
<?php } # end if
commit 624fafd6c903e7c34cc1165603e8c2a5588ac155
Author: Paul Richards <pa...@ma...>
Date: Sat Jul 18 23:08:35 2009 +0100
We dont use __FILE__ param of html_page_bottom. Note: someone who were to overload this function could use a version SERVER["SCRIPTNAME"] to retrieve the requested page name.
diff --git a/account_delete.php b/account_delete.php
index 565e0a8..1cd66c2 100644
--- a/account_delete.php
+++ b/account_delete.php
@@ -77,4 +77,4 @@ print_bracket_link( $t_redirect, lang_get( 'proceed' ) );
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_manage_columns_page.php b/account_manage_columns_page.php
index 528facb..77b0718 100644
--- a/account_manage_columns_page.php
+++ b/account_manage_columns_page.php
@@ -39,4 +39,4 @@
include ( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'manage_columns_inc.php' );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_page.php b/account_page.php
index 7968567..4937e15 100644
--- a/account_page.php
+++ b/account_page.php
@@ -285,8 +285,8 @@ if ( $t_ldap && ON == config_get( 'use_ldap_realname' ) ) {
</form>
</div>
-<?php } ?>
-<?php # Delete Account Form END ?>
+<?php
+}
+# Delete Account Form END
-<?php
- html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/account_prefs_page.php b/account_prefs_page.php
index e34a495..10e3de4 100644
--- a/account_prefs_page.php
+++ b/account_prefs_page.php
@@ -60,4 +60,4 @@
edit_account_prefs();
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_prefs_update.php b/account_prefs_update.php
index 3234d43..e816525 100644
--- a/account_prefs_update.php
+++ b/account_prefs_update.php
@@ -117,4 +117,4 @@
echo '<br />';
print_bracket_link( $f_redirect_url, lang_get( 'proceed' ) );
echo '<br /></div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_prof_edit_page.php b/account_prof_edit_page.php
index 3670bfc..e821831 100644
--- a/account_prof_edit_page.php
+++ b/account_prof_edit_page.php
@@ -114,7 +114,5 @@
</table>
</form>
</div>
-<?php # Edit Profile Form END ?>
-
<?php
- html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/account_prof_menu_page.php b/account_prof_menu_page.php
index 7c9b9de..7925df4 100644
--- a/account_prof_menu_page.php
+++ b/account_prof_menu_page.php
@@ -175,4 +175,4 @@
<?php
} # Edit or Delete Profile Form END
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/account_sponsor_page.php b/account_sponsor_page.php
index 58b0a21..0b3ce38 100644
--- a/account_sponsor_page.php
+++ b/account_sponsor_page.php
@@ -314,4 +314,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_sponsor_update.php b/account_sponsor_update.php
index ba4cbd2..12c0668 100644
--- a/account_sponsor_update.php
+++ b/account_sponsor_update.php
@@ -67,4 +67,4 @@
echo lang_get( 'operation_successful' ) . '<br />';
print_bracket_link( $t_redirect, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/account_update.php b/account_update.php
index ab1d1c3..f19743c 100644
--- a/account_update.php
+++ b/account_update.php
@@ -107,4 +107,4 @@
echo lang_get( 'operation_successful' ) . '<br />';
print_bracket_link( $t_redirect, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/adm_config_report.php b/adm_config_report.php
index 1eaa5ef..453030c 100644
--- a/adm_config_report.php
+++ b/adm_config_report.php
@@ -242,4 +242,4 @@
?>
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/adm_permissions_report.php b/adm_permissions_report.php
index 9d64035..40148b4 100644
--- a/adm_permissions_report.php
+++ b/adm_permissions_report.php
@@ -142,4 +142,4 @@
echo get_capability_row( lang_get( 'notify_of_new_user_created' ), config_get( 'notify_new_user_created_threshold_min' ) );
echo get_section_end();
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/admin/index.php b/admin/index.php
index c21ab20..09992b4 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -77,4 +77,4 @@ function print_info_row( $p_description, $p_value ) {
?>
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/admin/system_utils.php b/admin/system_utils.php
index a2d3d2d..c0d950d 100644
--- a/admin/system_utils.php
+++ b/admin/system_utils.php
@@ -95,4 +95,4 @@ foreach( $t_dest_ids as $t_id ) {
</table>
<?
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/admin/test_email.php b/admin/test_email.php
index a9b27c9..f01184b 100644
--- a/admin/test_email.php
+++ b/admin/test_email.php
@@ -74,4 +74,4 @@ html_page_top();
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/admin/test_icons.php b/admin/test_icons.php
index d002eab..01cc988 100644
--- a/admin/test_icons.php
+++ b/admin/test_icons.php
@@ -44,4 +44,4 @@ foreach( $g_file_type_icons as $t_ext => $t_filename ) {
echo '<br />';
}
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/admin/test_langs.php b/admin/test_langs.php
index 77e0c10..42cbc22 100644
--- a/admin/test_langs.php
+++ b/admin/test_langs.php
@@ -360,4 +360,4 @@ function print_error( $p_string ) {
echo "<font color='red'>ERROR: ", $p_string, '</font><br>';
}
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/billing_page.php b/billing_page.php
index f65425d..09451f6 100644
--- a/billing_page.php
+++ b/billing_page.php
@@ -40,5 +40,5 @@
# Work break-down
include( $t_mantis_dir . 'billing_inc.php' );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/bug_actiongroup.php b/bug_actiongroup.php
index 2fbaaa3..2f99df6 100644
--- a/bug_actiongroup.php
+++ b/bug_actiongroup.php
@@ -308,7 +308,7 @@
print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
} else {
print_header_redirect( $t_redirect_url );
}
diff --git a/bug_actiongroup_ext.php b/bug_actiongroup_ext.php
index 4aa9520..18cd08b 100644
--- a/bug_actiongroup_ext.php
+++ b/bug_actiongroup_ext.php
@@ -114,7 +114,7 @@
print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
} else {
print_header_redirect( $t_redirect_url );
}
diff --git a/bug_file_add.php b/bug_file_add.php
index cd78d77..bdfcf99 100644
--- a/bug_file_add.php
+++ b/bug_file_add.php
@@ -70,4 +70,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/bug_relationship_graph.php b/bug_relationship_graph.php
index 2c83588..568a15d 100644
--- a/bug_relationship_graph.php
+++ b/bug_relationship_graph.php
@@ -164,4 +164,4 @@
<?php
include( 'bug_view_inc.php' );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/bug_reminder.php b/bug_reminder.php
index a43df33..52847da 100644
--- a/bug_reminder.php
+++ b/bug_reminder.php
@@ -90,4 +90,4 @@
?>
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/bug_report.php b/bug_report.php
index 1d30ca4..3e30133 100644
--- a/bug_report.php
+++ b/bug_report.php
@@ -217,4 +217,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/bug_report_advanced_page.php b/bug_report_advanced_page.php
index 30d3110..1c9059e 100644
--- a/bug_report_advanced_page.php
+++ b/bug_report_advanced_page.php
@@ -14,4 +14,5 @@
# You should have received a copy of the GNU General Public License
# along with MantisBT. If not, see <http://www.gnu.org/licenses/>.
-include 'bug_report_page.php';
\ No newline at end of file
+include 'bug_report_page.php';
+
diff --git a/bug_report_page.php b/bug_report_page.php
index af74c00..dc7e006 100644
--- a/bug_report_page.php
+++ b/bug_report_page.php
@@ -533,4 +533,4 @@ if ( $tpl_show_due_date ) {
date_finish_calendar( 'due_date', 'trigger' );
}
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/bug_revision_view_page.php b/bug_revision_view_page.php
index a1e9cc5..a38097c 100644
--- a/bug_revision_view_page.php
+++ b/bug_revision_view_page.php
@@ -151,5 +151,5 @@ print_bracket_link( 'view.php?id=' . $t_bug_id, lang_get( 'back_to_issue' ) );
</table>
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 5b02da5..3a9224c 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -659,6 +659,6 @@ echo '</td></tr>';
echo '</table></form>';
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bugnote_view_inc.php' );
-html_page_bottom( __FILE__ );
+html_page_bottom();
last_visited_issue( $tpl_bug_id );
diff --git a/bug_view_inc.php b/bug_view_inc.php
index c7669a6..4d6ac30 100644
--- a/bug_view_inc.php
+++ b/bug_view_inc.php
@@ -721,6 +721,6 @@
include( $tpl_mantis_dir . 'history_inc.php' );
}
- html_page_bottom( $tpl_file );
+ html_page_bottom();
last_visited_issue( $tpl_bug_id );
diff --git a/bugnote_edit_page.php b/bugnote_edit_page.php
index 68853f2..1e495d4 100644
--- a/bugnote_edit_page.php
+++ b/bugnote_edit_page.php
@@ -122,4 +122,4 @@
</form>
</div>
-<?php html_page_bottom( __FILE__ );
+<?php html_page_bottom();
diff --git a/changelog_page.php b/changelog_page.php
index 2ff3559..782d539 100644
--- a/changelog_page.php
+++ b/changelog_page.php
@@ -317,4 +317,4 @@ foreach( $t_project_ids as $t_project_id ) {
if ( $t_project_index == 0 ) {
echo '<br /><span class="pagetitle">' . lang_get('changelog_empty') . '</span>';
}
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/core/bug_group_action_api.php b/core/bug_group_action_api.php
index 8a2af93..5477ab3 100644
--- a/core/bug_group_action_api.php
+++ b/core/bug_group_action_api.php
@@ -33,7 +33,7 @@ function bug_group_action_print_top() {
* Print the bottom part for the bug action group page.
*/
function bug_group_action_print_bottom() {
- html_page_bottom( __FILE__ );
+ html_page_bottom();
}
/**
diff --git a/core/html_api.php b/core/html_api.php
index 9b4fea9..03119fd 100644
--- a/core/html_api.php
+++ b/core/html_api.php
@@ -284,7 +284,7 @@ function html_page_bottom1a( $p_file = null ) {
}
html_bottom_banner();
- html_footer( $p_file );
+ html_footer();
html_body_end();
html_end();
}
@@ -574,7 +574,7 @@ function html_bottom_banner() {
* @param string $p_file
* @return null
*/
-function html_footer( $p_file ) {
+function html_footer( $p_file = null ) {
global $g_queries_array, $g_request_time;
# If a user is logged in, update their last visit time.
diff --git a/login_select_proj_page.php b/login_select_proj_page.php
index 745cdfe..5fc3ab1 100644
--- a/login_select_proj_page.php
+++ b/login_select_proj_page.php
@@ -82,4 +82,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/main_page.php b/main_page.php
index 3ad36b7..95cf418 100644
--- a/main_page.php
+++ b/main_page.php
@@ -111,5 +111,5 @@
echo '</div>';
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_columns_page.php b/manage_config_columns_page.php
index 0c76827..4d2a1c4 100644
--- a/manage_config_columns_page.php
+++ b/manage_config_columns_page.php
@@ -41,4 +41,4 @@
include ( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'manage_columns_inc.php' );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_columns_reset.php b/manage_config_columns_reset.php
index 490c74a..8fb00e5 100644
--- a/manage_config_columns_reset.php
+++ b/manage_config_columns_reset.php
@@ -51,4 +51,4 @@
print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_columns_set.php b/manage_config_columns_set.php
index c8e26ca..fed0c92 100644
--- a/manage_config_columns_set.php
+++ b/manage_config_columns_set.php
@@ -112,4 +112,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_email_page.php b/manage_config_email_page.php
index 687eea0..4725743 100644
--- a/manage_config_email_page.php
+++ b/manage_config_email_page.php
@@ -299,4 +299,4 @@
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_email_set.php b/manage_config_email_set.php
index a6d543b..15105f9 100644
--- a/manage_config_email_set.php
+++ b/manage_config_email_set.php
@@ -163,4 +163,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_revert.php b/manage_config_revert.php
index 7170456..e9f267d 100644
--- a/manage_config_revert.php
+++ b/manage_config_revert.php
@@ -70,4 +70,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_work_threshold_page.php b/manage_config_work_threshold_page.php
index aec9a8d..66c3f61 100644
--- a/manage_config_work_threshold_page.php
+++ b/manage_config_work_threshold_page.php
@@ -337,4 +337,4 @@
echo "</form></div>\n";
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_work_threshold_set.php b/manage_config_work_threshold_set.php
index bf6e87b..904befd 100644
--- a/manage_config_work_threshold_set.php
+++ b/manage_config_work_threshold_set.php
@@ -167,4 +167,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_workflow_page.php b/manage_config_workflow_page.php
index 9474cd1..ac4aed4 100644
--- a/manage_config_workflow_page.php
+++ b/manage_config_workflow_page.php
@@ -492,4 +492,4 @@
echo "</form>\n";
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_config_workflow_set.php b/manage_config_workflow_set.php
index 2c71256..974a89c 100644
--- a/manage_config_workflow_set.php
+++ b/manage_config_workflow_set.php
@@ -133,4 +133,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_custom_field_create.php b/manage_custom_field_create.php
index 523dfd3..096449a 100644
--- a/manage_custom_field_create.php
+++ b/manage_custom_field_create.php
@@ -55,5 +55,5 @@
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_custom_field_delete.php b/manage_custom_field_delete.php
index f5bba45..64b7f57 100644
--- a/manage_custom_field_delete.php
+++ b/manage_custom_field_delete.php
@@ -63,4 +63,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_custom_field_edit_page.php b/manage_custom_field_edit_page.php
index f26a0b6..d8eb662 100644
--- a/manage_custom_field_edit_page.php
+++ b/manage_custom_field_edit_page.php
@@ -294,4 +294,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_custom_field_page.php b/manage_custom_field_page.php
index ad6a5f2..d39b966 100644
--- a/manage_custom_field_page.php
+++ b/manage_custom_field_page.php
@@ -106,4 +106,4 @@
<br />
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_custom_field_update.php b/manage_custom_field_update.php
index 4392354..a76c376 100644
--- a/manage_custom_field_update.php
+++ b/manage_custom_field_update.php
@@ -69,4 +69,4 @@
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_overview_page.php b/manage_overview_page.php
index df0bf82..d51391e 100644
--- a/manage_overview_page.php
+++ b/manage_overview_page.php
@@ -86,5 +86,5 @@ event_signal( 'EVENT_MANAGE_OVERVIEW_INFO', array( $t_is_admin ) )
</table>
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/manage_proj_cat_delete.php b/manage_proj_cat_delete.php
index f068dfb..09c46df 100644
--- a/manage_proj_cat_delete.php
+++ b/manage_proj_cat_delete.php
@@ -70,4 +70,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_cat_edit_page.php b/manage_proj_cat_edit_page.php
index 17e2ef7..99887dd 100644
--- a/manage_proj_cat_edit_page.php
+++ b/manage_proj_cat_edit_page.php
@@ -98,4 +98,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_cat_update.php b/manage_proj_cat_update.php
index d18b4e3..d9870bd 100644
--- a/manage_proj_cat_update.php
+++ b/manage_proj_cat_update.php
@@ -73,4 +73,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_create.php b/manage_proj_create.php
index 444b1bc..aac3fa9 100644
--- a/manage_proj_create.php
+++ b/manage_proj_create.php
@@ -84,4 +84,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_create_page.php b/manage_proj_create_page.php
index e52caf0..57ab3c1 100644
--- a/manage_proj_create_page.php
+++ b/manage_proj_create_page.php
@@ -145,4 +145,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_custom_field_add_existing.php b/manage_proj_custom_field_add_existing.php
index ee4c840..99be6b9 100644
--- a/manage_proj_custom_field_add_existing.php
+++ b/manage_proj_custom_field_add_existing.php
@@ -59,4 +59,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_custom_field_remove.php b/manage_proj_custom_field_remove.php
index 7929919..421b846 100644
--- a/manage_proj_custom_field_remove.php
+++ b/manage_proj_custom_field_remove.php
@@ -69,4 +69,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_custom_field_update.php b/manage_proj_custom_field_update.php
index cae7401..ec67fd6 100644
--- a/manage_proj_custom_field_update.php
+++ b/manage_proj_custom_field_update.php
@@ -59,4 +59,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_edit_page.php b/manage_proj_edit_page.php
index 234ba27..2a539a5 100644
--- a/manage_proj_edit_page.php
+++ b/manage_proj_edit_page.php
@@ -828,4 +828,4 @@ if ( $t_can_manage_users ) {
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_page.php b/manage_proj_page.php
index decdc57..dc10111 100644
--- a/manage_proj_page.php
+++ b/manage_proj_page.php
@@ -234,4 +234,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_subproj_add.php b/manage_proj_subproj_add.php
index 6bfd385..83d89b3 100644
--- a/manage_proj_subproj_add.php
+++ b/manage_proj_subproj_add.php
@@ -57,4 +57,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_subproj_delete.php b/manage_proj_subproj_delete.php
index 4b0512f..b8b7f88 100644
--- a/manage_proj_subproj_delete.php
+++ b/manage_proj_subproj_delete.php
@@ -51,4 +51,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_user_remove.php b/manage_proj_user_remove.php
index 65f0d84..e17098a 100644
--- a/manage_proj_user_remove.php
+++ b/manage_proj_user_remove.php
@@ -67,4 +67,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_ver_add.php b/manage_proj_ver_add.php
index 3bedcd1..1965dcb 100644
--- a/manage_proj_ver_add.php
+++ b/manage_proj_ver_add.php
@@ -89,4 +89,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_ver_delete.php b/manage_proj_ver_delete.php
index d45713d..51fa374 100644
--- a/manage_proj_ver_delete.php
+++ b/manage_proj_ver_delete.php
@@ -58,4 +58,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_ver_edit_page.php b/manage_proj_ver_edit_page.php
index 7d81481..ad2672e 100644
--- a/manage_proj_ver_edit_page.php
+++ b/manage_proj_ver_edit_page.php
@@ -116,4 +116,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_proj_ver_update.php b/manage_proj_ver_update.php
index b3fd971..1f8104d 100644
--- a/manage_proj_ver_update.php
+++ b/manage_proj_ver_update.php
@@ -75,4 +75,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_tags_page.php b/manage_tags_page.php
index d20d3a8..d83d0fd 100644
--- a/manage_tags_page.php
+++ b/manage_tags_page.php
@@ -222,4 +222,4 @@ foreach ( $t_result as $t_tag_row ) {
<?php
} #End can Edit
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/manage_user_create.php b/manage_user_create.php
index 2665972..df7d719 100644
--- a/manage_user_create.php
+++ b/manage_user_create.php
@@ -111,4 +111,4 @@
?>
</div>
-<?php html_page_bottom( __FILE__ );
+<?php html_page_bottom();
diff --git a/manage_user_create_page.php b/manage_user_create_page.php
index 9ccfca6..a535ae5 100644
--- a/manage_user_create_page.php
+++ b/manage_user_create_page.php
@@ -137,4 +137,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_delete.php b/manage_user_delete.php
index b643933..4eca7a5 100644
--- a/manage_user_delete.php
+++ b/manage_user_delete.php
@@ -56,4 +56,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php
index 769dbe0..275f0bc 100644
--- a/manage_user_edit_page.php
+++ b/manage_user_edit_page.php
@@ -259,4 +259,4 @@
include ( 'account_prefs_inc.php' );
edit_account_prefs( $t_user['id'], false, false, 'manage_user_edit_page.php?user_id=' . $t_user_id );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_page.php b/manage_user_page.php
index af73232..911012a 100644
--- a/manage_user_page.php
+++ b/manage_user_page.php
@@ -348,4 +348,4 @@
<input type="submit" class="button" value="<?php echo lang_get( 'manage_user' ) ?>" />
</form>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_proj_delete.php b/manage_user_proj_delete.php
index 5528bd8..f99bfb5 100644
--- a/manage_user_proj_delete.php
+++ b/manage_user_proj_delete.php
@@ -58,4 +58,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_reset.php b/manage_user_reset.php
index 9dfdcd7..7dd6ce1 100644
--- a/manage_user_reset.php
+++ b/manage_user_reset.php
@@ -60,4 +60,4 @@
print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/manage_user_update.php b/manage_user_update.php
index 91dce19..c1c789e 100644
--- a/manage_user_update.php
+++ b/manage_user_update.php
@@ -177,4 +177,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/my_view_page.php b/my_view_page.php
index 04300df..2c95fcb 100644
--- a/my_view_page.php
+++ b/my_view_page.php
@@ -171,4 +171,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/news_add.php b/news_add.php
index b635058..75e2d15 100644
--- a/news_add.php
+++ b/news_add.php
@@ -61,4 +61,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/news_edit_page.php b/news_edit_page.php
index 7fd282c..b0ccc1e 100644
--- a/news_edit_page.php
+++ b/news_edit_page.php
@@ -147,4 +147,4 @@
<?php
# Edit News Form END
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/news_list_page.php b/news_list_page.php
index 76c473c..cffe01d 100644
--- a/news_list_page.php
+++ b/news_list_page.php
@@ -78,4 +78,4 @@
echo '</ul>';
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/news_menu_page.php b/news_menu_page.php
index 2c0b841..489304c 100644
--- a/news_menu_page.php
+++ b/news_menu_page.php
@@ -130,4 +130,4 @@
<?php
} # Edit/Delete News Form END
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/news_update.php b/news_update.php
index 21d65de..67f1440 100644
--- a/news_update.php
+++ b/news_update.php
@@ -65,4 +65,4 @@
?>
</div>
-<?php html_page_bottom( __FILE__ );
+<?php html_page_bottom();
diff --git a/news_view_page.php b/news_view_page.php
index ff20bb6..0fd0934 100644
--- a/news_view_page.php
+++ b/news_view_page.php
@@ -56,4 +56,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/permalink_page.php b/permalink_page.php
index 97871ec..aed6369 100644
--- a/permalink_page.php
+++ b/permalink_page.php
@@ -48,4 +48,4 @@
?>
</div>
<?php
- html_page_bottom( __FILE__ );
\ No newline at end of file
+ html_page_bottom();
\ No newline at end of file
diff --git a/plugins/MantisCoreFormatting/pages/config.php b/plugins/MantisCoreFormatting/pages/config.php
index b5b4e7b..de85f37 100644
--- a/plugins/MantisCoreFormatting/pages/config.php
+++ b/plugins/MantisCoreFormatting/pages/config.php
@@ -100,4 +100,4 @@ print_manage_menu( );
</form>
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/plugins/MantisGraph/pages/bug_graph_page.php b/plugins/MantisGraph/pages/bug_graph_page.php
index f9f9828..c94c2a4 100644
--- a/plugins/MantisGraph/pages/bug_graph_page.php
+++ b/plugins/MantisGraph/pages/bug_graph_page.php
@@ -117,4 +117,4 @@
}
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/MantisGraph/pages/config.php b/plugins/MantisGraph/pages/config.php
index d463f21..4268c8e 100644
--- a/plugins/MantisGraph/pages/config.php
+++ b/plugins/MantisGraph/pages/config.php
@@ -95,4 +95,4 @@ print_manage_menu( );
<form>
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_graph_imp_category.php b/plugins/MantisGraph/pages/summary_graph_imp_category.php
index 9b51d78..ec7acf7 100644
--- a/plugins/MantisGraph/pages/summary_graph_imp_category.php
+++ b/plugins/MantisGraph/pages/summary_graph_imp_category.php
@@ -66,4 +66,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_graph_imp_priority.php b/plugins/MantisGraph/pages/summary_graph_imp_priority.php
index f3c39c2..af726ce 100644
--- a/plugins/MantisGraph/pages/summary_graph_imp_priority.php
+++ b/plugins/MantisGraph/pages/summary_graph_imp_priority.php
@@ -71,4 +71,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_graph_imp_resolution.php b/plugins/MantisGraph/pages/summary_graph_imp_resolution.php
index c551feb..02fa13b 100644
--- a/plugins/MantisGraph/pages/summary_graph_imp_resolution.php
+++ b/plugins/MantisGraph/pages/summary_graph_imp_resolution.php
@@ -70,4 +70,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_graph_imp_severity.php b/plugins/MantisGraph/pages/summary_graph_imp_severity.php
index 5ee64ee..f989d22 100644
--- a/plugins/MantisGraph/pages/summary_graph_imp_severity.php
+++ b/plugins/MantisGraph/pages/summary_graph_imp_severity.php
@@ -68,4 +68,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_graph_imp_status.php b/plugins/MantisGraph/pages/summary_graph_imp_status.php
index c6107dd..4ff57b2 100644
--- a/plugins/MantisGraph/pages/summary_graph_imp_status.php
+++ b/plugins/MantisGraph/pages/summary_graph_imp_status.php
@@ -62,4 +62,4 @@
</tr>
</table>
-<?php html_page_bottom( __FILE__ );
+<?php html_page_bottom();
diff --git a/plugins/MantisGraph/pages/summary_jpgraph_page.php b/plugins/MantisGraph/pages/summary_jpgraph_page.php
index cb9eb65..92645a5 100644
--- a/plugins/MantisGraph/pages/summary_jpgraph_page.php
+++ b/plugins/MantisGraph/pages/summary_jpgraph_page.php
@@ -70,4 +70,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/plugins/XmlImportExport/pages/import.php b/plugins/XmlImportExport/pages/import.php
index 6387ef7..8187cd7 100644
--- a/plugins/XmlImportExport/pages/import.php
+++ b/plugins/XmlImportExport/pages/import.php
@@ -121,4 +121,4 @@ if( ALL_PROJECTS == $t_project_id ) {
</div>
<?php
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/plugins/XmlImportExport/pages/import_action.php b/plugins/XmlImportExport/pages/import_action.php
index 6fc76bd..79094c3 100644
--- a/plugins/XmlImportExport/pages/import_action.php
+++ b/plugins/XmlImportExport/pages/import_action.php
@@ -43,4 +43,4 @@ echo "<pre>\n";
$importer->import( );
echo "</pre>\n";
-html_page_bottom( __FILE__ );
+html_page_bottom();
diff --git a/print_all_bug_options_page.php b/print_all_bug_options_page.php
index 6eee5bc..7bf813c 100644
--- a/print_all_bug_options_page.php
+++ b/print_all_bug_options_page.php
@@ -35,4 +35,4 @@
html_page_top();
edit_printing_prefs();
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/print_all_bug_options_reset.php b/print_all_bug_options_reset.php
index 32ad555..4d48a48 100644
--- a/print_all_bug_options_reset.php
+++ b/print_all_bug_options_reset.php
@@ -75,4 +75,4 @@
echo '<br />';
print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
echo '<br /></div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/print_all_bug_options_update.php b/print_all_bug_options_update.php
index fd407f6..b7577c2 100644
--- a/print_all_bug_options_update.php
+++ b/print_all_bug_options_update.php
@@ -81,4 +81,4 @@
echo '<br />';
print_bracket_link( $f_redirect_url, lang_get( 'proceed' ) );
echo '<br /></div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_add.php b/proj_doc_add.php
index 970e71d..b93f534 100644
--- a/proj_doc_add.php
+++ b/proj_doc_add.php
@@ -62,4 +62,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_add_page.php b/proj_doc_add_page.php
index 9adfac3..d2df5cb 100644
--- a/proj_doc_add_page.php
+++ b/proj_doc_add_page.php
@@ -93,4 +93,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_delete.php b/proj_doc_delete.php
index 0a4e4b9..684c7b5 100644
--- a/proj_doc_delete.php
+++ b/proj_doc_delete.php
@@ -66,4 +66,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_edit_page.php b/proj_doc_edit_page.php
index 3a308df..8457332 100644
--- a/proj_doc_edit_page.php
+++ b/proj_doc_edit_page.php
@@ -134,4 +134,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_page.php b/proj_doc_page.php
index 5acdd4c..84f12ab 100644
--- a/proj_doc_page.php
+++ b/proj_doc_page.php
@@ -143,4 +143,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/proj_doc_update.php b/proj_doc_update.php
index d1b778c..bf3eb8d 100644
--- a/proj_doc_update.php
+++ b/proj_doc_update.php
@@ -139,4 +139,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/project_page.php b/project_page.php
index 4226838..58e84a3 100644
--- a/project_page.php
+++ b/project_page.php
@@ -116,4 +116,4 @@
}
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/query_delete.php b/query_delete.php
index 8e8f60d..4760427 100644
--- a/query_delete.php
+++ b/query_delete.php
@@ -59,5 +59,5 @@
<?php
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
}
diff --git a/query_delete_page.php b/query_delete_page.php
index 30fd71f..061ae3a 100644
--- a/query_delete_page.php
+++ b/query_delete_page.php
@@ -64,4 +64,4 @@
<?php
print '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/query_store_page.php b/query_store_page.php
index 2247e76..ea0c21d 100644
--- a/query_store_page.php
+++ b/query_store_page.php
@@ -80,4 +80,4 @@
</form>
<?php
echo '</div>';
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/query_view_page.php b/query_view_page.php
index cc67306..4f1e868 100644
--- a/query_view_page.php
+++ b/query_view_page.php
@@ -98,4 +98,4 @@
</table>
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/roadmap_page.php b/roadmap_page.php
index e1c2cdc..53228df 100644
--- a/roadmap_page.php
+++ b/roadmap_page.php
@@ -314,4 +314,4 @@
$t_project_index++;
}
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/set_project.php b/set_project.php
index dbccbce..945cf99 100644
--- a/set_project.php
+++ b/set_project.php
@@ -112,4 +112,4 @@
</div>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/summary_page.php b/summary_page.php
index 8305624..1b671e8 100644
--- a/summary_page.php
+++ b/summary_page.php
@@ -360,4 +360,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/tag_attach.php b/tag_attach.php
index 5ab62fb..99a80da 100644
--- a/tag_attach.php
+++ b/tag_attach.php
@@ -113,7 +113,7 @@
</tr>
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
// end failed to attach tag
} else {
foreach( $t_tags_create as $t_tag_row ) {
diff --git a/tag_update_page.php b/tag_update_page.php
index bc32a56..f98fdb0 100644
--- a/tag_update_page.php
+++ b/tag_update_page.php
@@ -118,4 +118,4 @@
</form>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/tag_view_page.php b/tag_view_page.php
index 3fb2a3b..524b9b9 100644
--- a/tag_view_page.php
+++ b/tag_view_page.php
@@ -134,4 +134,4 @@
</table>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/view_all_bug_page.php b/view_all_bug_page.php
index 13c95bb..2182e3a 100644
--- a/view_all_bug_page.php
+++ b/view_all_bug_page.php
@@ -73,4 +73,4 @@
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'view_all_inc.php' );
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/view_filters_page.php b/view_filters_page.php
index 7b6a655..a50cfe9 100644
--- a/view_filters_page.php
+++ b/view_filters_page.php
@@ -514,4 +514,4 @@ if ( $t_column > 0 ) {
</form>
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
diff --git a/view_user_page.php b/view_user_page.php
index 394ab18..8e2ec81 100644
--- a/view_user_page.php
+++ b/view_user_page.php
@@ -117,4 +117,4 @@
<br />
<?php
- html_page_bottom( __FILE__ );
+ html_page_bottom();
commit f6a7b45b6d6f9897e7790f89c4c99c4d3e67ab26
Author: Paul Richards <pa...@ma...>
Date: Tue Jul 14 00:14:21 2009 +0100
Update columns api so that columns_get_standard and columns_filter_disabled implement similar filtering.
diff --git a/core/columns_api.php b/core/columns_api.php
index 175bb36..9453643 100644
--- a/core/columns_api.php
+++ b/core/columns_api.php
@@ -31,42 +31,36 @@
*/
function columns_filter_disabled( $p_columns ) {
$t_columns = array();
-
- $t_enable_eta = in_array( BUG_FIELD_ETA, $p_columns ) && ( config_get( 'enable_eta' ) == ON );
- $t_enable_projection = in_array( BUG_FIELD_PROJECTION, $p_columns ) && ( config_get( 'enable_projection' ) == ON );
- $t_enable_product_build = in_array( BUG_FIELD_PRODUCT_BUILD, $p_columns ) && ( config_get( 'enable_product_build' ) == ON );
- $t_enable_profiles = ( in_array( BUG_FIELD_PLATFORM, $p_columns ) ||
- in_array( BUG_FIELD_OS, $p_columns ) ||
- in_array( BUG_FIELD_OS_VERSION, $p_columns ) ) &&
- ( config_get( 'enable_profiles' ) == ON );
-
+ $t_enable_profiles = ( config_get( 'enable_profiles' ) == ON );
+
foreach ( $p_columns as $t_column ) {
- if ( $t_column == BUG_FIELD_ETA && !$t_enable_eta ) {
- continue;
- }
-
- if ( $t_column == BUG_FIELD_PROJECTION && !$t_enable_projection ) {
- continue;
- }
-
- if ( $t_column == BUG_FIELD_PRODUCT_BUILD && !$t_enable_product_build ) {
- continue;
- }
-
- if ( $t_column == BUG_FIELD_PLATFORM && !$t_enable_profiles ) {
- continue;
- }
-
- if ( $t_column == BUG_FIELD_OS && !$t_enable_profiles ) {
- continue;
- }
-
- if ( $t_column == BUG_FIELD_OS_VERSION && !$t_enable_profiles ) {
- continue;
+ switch( $t_column ) {
+ case 'os':
+ case 'os_build':
+ case 'platform':
+ if( ! $t_enable_profiles ) {
+ continue 2;
+ }
+ /* don't filter */
+ break;
+ case 'eta':
+ if( config_get( 'enable_eta' ) == OFF ) {
+ continue 2;
+ }
+ case 'projection':
+ if( config_get( 'enable_projection' ) == OFF ) {
+ continue 2;
+ }
+ case 'build':
+ if( config_get( 'enable_product_build' ) == OFF ) {
+ continue 2;
+ }
+ default:
+ /* don't filter */
+ break;
}
-
$t_columns[] = $t_column;
- }
+ } /* continued 2 */
return $t_columns;
}
@@ -87,6 +81,18 @@ function columns_get_standard() {
unset( $t_columns['platform'] );
}
+ if( config_get( 'enable_eta' ) == OFF ) {
+ unset( $t_columns['eta'] );
+ }
+
+ if( config_get( 'enable_projection' ) == OFF ) {
+ unset( $t_columns['projection'] );
+ }
+
+ if( config_get( 'enable_product_build' ) == OFF ) {
+ unset( $t_columns['build'] );
+ }
+
return array_keys($t_columns);
}
commit d375252e9200beaf12046a74060b91a8a6bc907d
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:27:41 2009 +0100
compress_api.php is included by core.php
diff --git a/bug_view_inc.php b/bug_view_inc.php
index 9caaa7c..c7669a6 100644
--- a/bug_view_inc.php
+++ b/bug_view_inc.php
@@ -36,7 +36,6 @@
require_once( 'bug_api.php' );
require_once( 'custom_field_api.php' );
require_once( 'file_api.php' );
- require_once( 'compress_api.php' );
require_once( 'date_api.php' );
require_once( 'relationship_api.php' );
require_once( 'last_visited_api.php' );
commit c81216ab38cd5c1bf669add2170b63650c0af2d6
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:27:06 2009 +0100
Fix a couple of html errors introduced
diff --git a/bug_view_inc.php b/bug_view_inc.php
index 1caafab..9caaa7c 100644
--- a/bug_view_inc.php
+++ b/bug_view_inc.php
@@ -246,9 +246,9 @@
print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' );
}
}
+ echo '</span></td>';
}
- echo '</span></td>';
# Links
echo '<td class="right" colspan="2">';
@@ -263,7 +263,7 @@
# Print Bug
echo '<span class="small">';
print_bracket_link( $tpl_print_link, lang_get( 'print' ) );
-
+ echo '</span>';
echo '</td>';
echo '</tr>';
commit 686bb5ff9bba27894d191c4f2547335770aff13b
Author: Paul Richards <pa...@ma...>
Date: Thu Jul 9 23:26:53 2009 +0100
Check if config string is empty before going around preg loop
diff --git a/core/config_api.php b/core/config_api.php
index f1b35ad..e5c435a 100644
--- a/core/config_api.php
+++ b/core/config_api.php
@@ -547,7 +547,7 @@ function config_obsolete( $p_var, $p_replace ) {
# the string
function config_eval( $p_value ) {
$t_value = $p_value;
- if( is_string( $t_value ) && !is_numeric( $t_value ) ) {
+ if( !empty( $t_value ) && is_string( $t_value ) && !is_numeric( $t_value ) ) {
if( 0 < preg_match_all( '/(?:^|[^\\\\])(%([^%]+)%)/U', $t_value, $t_matches ) ) {
$t_count = count( $t_matches[0] );
for( $i = 0;$i < $t_count;$i++ ) {
-----------------------------------------------------------------------
--
Mantis Bug Tracker
|