From ec9fc27c0d6001ab6cb8754681ea61343efc462e Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 18 Aug 2006 22:37:49 +0000 Subject: [PATCH] r1084: Well the delete thing was actually present throughout the entire admin section --- admin/autoaction.php | 2 +- admin/field.php | 2 +- admin/permission.php | 2 +- admin/priority.php | 2 +- admin/product.php | 4 ++-- admin/resolution.php | 2 +- admin/severity.php | 2 +- admin/status.php | 2 +- admin/user.php | 2 +- admin/usergroup.php | 2 +- admin/userhelp.php | 2 +- docs/changes.txt | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/admin/autoaction.php b/admin/autoaction.php index 45930bb..7748340 100644 --- a/admin/autoaction.php +++ b/admin/autoaction.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this action?'), "autoaction.php?do=kill&actionid=$action[actionid]"); + $admin->page_confirm(_('Are you sure you want to delete this action?'), 'autoaction.php', 'kill', array('actionid' => $bugsys->in['actionid'])); } // ################################################################### diff --git a/admin/field.php b/admin/field.php index 3e89806..5c4dc04 100644 --- a/admin/field.php +++ b/admin/field.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this bug field? Doing so will remove everything for this field and it cannot be undone!'), "field.php?do=kill&fieldid=" . $bugsys->in['fieldid']); + $admin->page_confirm(_('Are you sure you want to delete this bug field? Doing so will remove everything for this field and it cannot be undone!'), 'field.php', 'kill', array('fieldid' => $bugsys->in['fieldid'])); } // ################################################################### diff --git a/admin/permission.php b/admin/permission.php index 1ed29a3..dcbea49 100755 --- a/admin/permission.php +++ b/admin/permission.php @@ -86,7 +86,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to revert this permission mask?'), 'permission.php?do=kill&usergroupid=' . $bugsys->input_clean('usergroupid', TYPE_UINT) . '&productid=' . $bugsys->input_clean('productid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to revert this permission mask?'), 'permission.php', 'kill', array('usergroupid' => $bugsys->input_clean('usergroupid', TYPE_UINT), 'productid' => $bugsys->input_clean('productid', TYPE_UINT))); } // ################################################################### diff --git a/admin/priority.php b/admin/priority.php index cb55b6d..4ef1db1 100755 --- a/admin/priority.php +++ b/admin/priority.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this priority? Doing so will revert all bugs to the default priority (which is set in the options panel)?'), 'priority.php?do=kill&priorityid=' . $bugsys->input_clean('priorityid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this priority? Doing so will revert all bugs to the default priority (which is set in the options panel)?'), 'priority.php', 'kill', array('priorityid' => $bugsys->input_clean('priorityid', TYPE_UINT))); } // ################################################################### diff --git a/admin/product.php b/admin/product.php index 044fc79..c99502f 100755 --- a/admin/product.php +++ b/admin/product.php @@ -94,7 +94,7 @@ if ($_REQUEST['do'] == 'killversion') if ($_REQUEST['do'] == 'deleteversion') { - $admin->page_confirm(_('Are you sure you want to delete this version? Doing so will do delete all the bugs with this version.'), 'product.php?do=killversion&versionid=' . $bugsys->input_clean('versionid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this version? Doing so will do delete all the bugs with this version.'), 'product.php'm 'killversion', array('versionid' => $bugsys->input_clean('versionid', TYPE_UINT))); } // ################################################################### @@ -205,7 +205,7 @@ if ($_REQUEST['do'] == 'killproduct') if ($_REQUEST['do'] == 'deleteproduct') { - $admin->page_confirm(_('Are you sure you want to delete this product and all of it\'s versions and components and any bugs that have been assigned those products or components?'), 'product.php?do=killproduct&productid=' . $bugsys->input_clean('productid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this product and all of it\'s versions and components and any bugs that have been assigned those products or components?'), 'product.php', 'killproduct' array('productid' => $bugsys->input_clean('productid', TYPE_UINT))); } // ################################################################### diff --git a/admin/resolution.php b/admin/resolution.php index 0fb551d..efc3d49 100755 --- a/admin/resolution.php +++ b/admin/resolution.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this resolution? Doing so will revert all bugs to the default resolution (which is set in the options panel)?'), 'resolution.php?do=kill&resolutionid=' . $bugsys->input_clean('resolutionid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this resolution? Doing so will revert all bugs to the default resolution (which is set in the options panel)?'), 'resolution.php', 'kill', array('resolutionid' => $bugsys->input_clean('resolutionid', TYPE_UINT))); } // ################################################################### diff --git a/admin/severity.php b/admin/severity.php index b17bedf..e56ac79 100755 --- a/admin/severity.php +++ b/admin/severity.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this severity? Doing so will revert all bugs to the default severity (which is set in the options panel)?'), 'severity.php?do=kill&severityid=' . $bugsys->input_clean('severityid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this severity? Doing so will revert all bugs to the default severity (which is set in the options panel)?'), 'severity.php', 'kill', array('severityid' => $bugsys->input_clean('severityid', TYPE_UINT))); } // ################################################################### diff --git a/admin/status.php b/admin/status.php index de78958..7a6c8f5 100755 --- a/admin/status.php +++ b/admin/status.php @@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this status? Doing so will revert all bugs to the default status (which is set in the options panel)?'), 'status.php?do=kill&statusid=' . $bugsys->input_clean('statusid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this status? Doing so will revert all bugs to the default status (which is set in the options panel)?'), 'status.php', 'kill', array('statusid' => $bugsys->input_clean('statusid', TYPE_UINT))); } // ################################################################### diff --git a/admin/user.php b/admin/user.php index 052f501..8121c2c 100644 --- a/admin/user.php +++ b/admin/user.php @@ -73,7 +73,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete this user?'), 'user.php?do=kill&userid=' . $bugsys->input_clean('userid', TYPE_UINT)); + $admin->page_confirm(_('Are you sure you want to delete this user?'), 'user.php', 'kill', array('userid' => $bugsys->input_clean('userid', TYPE_UINT))); } // ################################################################### diff --git a/admin/usergroup.php b/admin/usergroup.php index 9927d18..d296e08 100755 --- a/admin/usergroup.php +++ b/admin/usergroup.php @@ -103,7 +103,7 @@ if ($_REQUEST['do'] == 'delete') $admin->error(_('You can\'t delete a default usergroup.')); } - $admin->page_confirm(_('Are you sure you want to delete this usergroup? All users in this group will be set back to the default registered usergroup (id: 2).'), 'usergroup.php?do=kill&usergroupid=' . $bugsys->in['usergroupid']); + $admin->page_confirm(_('Are you sure you want to delete this usergroup? All users in this group will be set back to the default registered usergroup (id: 2).'), 'usergroup.php', 'kill', array('usergroupid' => $bugsys->in['usergroupid'])); } // ################################################################### diff --git a/admin/userhelp.php b/admin/userhelp.php index 7ec9e87..e9e61c5 100755 --- a/admin/userhelp.php +++ b/admin/userhelp.php @@ -59,7 +59,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(_('Are you sure you want to delete help text?'), 'userhelp.php?do=kill&keystring=' . $bugsys->in['keystring']); + $admin->page_confirm(_('Are you sure you want to delete help text?'), 'userhelp.php', 'kill', array('keystring' => $bugsys->in['keystring'])); } // ################################################################### diff --git a/docs/changes.txt b/docs/changes.txt index 3bf8429..6f475db 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -9,7 +9,7 @@ - Created a Language API - Fix a call to a non-object error [editcomment.php#116] - Switch to gettext language system instead of the XML-strings format -- Fixing warnings related to Printer->page_confirm() [language.php#59] +- Fixing warnings related to Printer->page_confirm() throughout the entire admin section 1.1.0 Beta 1 ================== -- 2.22.5