aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-29 12:56:38 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-29 12:56:38 +0000
commit9dc82aa869c36388513d005a846573d332d8f96d (patch)
tree678373ac291753bad88f0e94754f0d62b1934ec7
parentf0e7d14c218696142b41e0183dc734ddff162018 (diff)
downloadelgg-9dc82aa869c36388513d005a846573d332d8f96d.tar.gz
elgg-9dc82aa869c36388513d005a846573d332d8f96d.tar.bz2
Fixes #2508 Sending user to referrer in reported content admin actions
git-svn-id: http://code.elgg.org/elgg/trunk@7471 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/reportedcontent/actions/archive.php17
-rw-r--r--mod/reportedcontent/actions/delete.php20
2 files changed, 18 insertions, 19 deletions
diff --git a/mod/reportedcontent/actions/archive.php b/mod/reportedcontent/actions/archive.php
index c41645ee2..dd5c6aef1 100644
--- a/mod/reportedcontent/actions/archive.php
+++ b/mod/reportedcontent/actions/archive.php
@@ -5,22 +5,23 @@
* @package ElggReportedContent
*/
-// Get input data
$guid = (int) get_input('guid');
-// Make sure we actually have permission to edit
$report = get_entity($guid);
+
+// Make sure we actually have permission to edit
if ($report->getSubtype() == "reported_content" && $report->canEdit()) {
- // change the state
- if (!elgg_trigger_plugin_hook('reportedcontent:archive', 'system', array('report'=>$report), TRUE)) {
+
+ // allow another plugin to override
+ if (!elgg_trigger_plugin_hook('reportedcontent:archive', 'system', array('report' => $report), TRUE)) {
system_message(elgg_echo("reportedcontent:notarchived"));
- forward('pg/admin/reportedcontent');
+ forward(REFERER);
}
+
+ // change the state
$report->state = "archived";
- // Success message
system_message(elgg_echo("reportedcontent:archived"));
- // Forward back to the reported content page
- forward('pg/admin/reportedcontent');
+ forward(REFERER);
}
diff --git a/mod/reportedcontent/actions/delete.php b/mod/reportedcontent/actions/delete.php
index faf169223..f7d4e2107 100644
--- a/mod/reportedcontent/actions/delete.php
+++ b/mod/reportedcontent/actions/delete.php
@@ -2,29 +2,27 @@
/**
* Elgg reported content: delete action
*
- * @package ElggReportedCOntent
+ * @package ElggReportedContent
*/
-// Get input data
$guid = (int) get_input('guid');
-// Make sure we actually have permission to edit
$report = get_entity($guid);
+
+// Make sure we actually have permission to delete
if ($report->getSubtype() == "reported_content" && $report->canEdit()) {
- // Delete it!
- if (!elgg_trigger_plugin_hook('reportedcontent:delete', '$system', array('report'=>$report), true)) {
+
+ // give another plugin a chance to override
+ if (!elgg_trigger_plugin_hook('reportedcontent:delete', 'system', array('report' => $report), TRUE)) {
register_error(elgg_echo("reportedcontent:notdeleted"));
- forward('pg/admin/reportedcontent');
+ forward(REFERER);
}
- $rowsaffected = $report->delete();
- if ($rowsaffected > 0) {
- // Success message
+ if ($report->delete()) {
system_message(elgg_echo("reportedcontent:deleted"));
} else {
register_error(elgg_echo("reportedcontent:notdeleted"));
}
- // Forward back to the reported content page
- forward('pg/admin/reportedcontent');
+ forward(REFERER);
}