From 76d3b27335145459e1b9da4e07cf37ad8bd050c1 Mon Sep 17 00:00:00 2001 From: nickw Date: Tue, 25 May 2010 22:18:22 +0000 Subject: Updating administration plugins with admin submenu views. git-svn-id: http://code.elgg.org/elgg/trunk@6220 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/reportedcontent/actions/archive.php | 63 +++++++++----------- mod/reportedcontent/actions/delete.php | 68 ++++++++++------------ mod/reportedcontent/index.php | 27 --------- mod/reportedcontent/start.php | 29 ++------- .../default/admin/overview/reportedcontent.php | 27 +++++++++ 5 files changed, 93 insertions(+), 121 deletions(-) delete mode 100644 mod/reportedcontent/index.php create mode 100644 mod/reportedcontent/views/default/admin/overview/reportedcontent.php (limited to 'mod/reportedcontent') diff --git a/mod/reportedcontent/actions/archive.php b/mod/reportedcontent/actions/archive.php index ca4ad2c41..c6cfe58bb 100644 --- a/mod/reportedcontent/actions/archive.php +++ b/mod/reportedcontent/actions/archive.php @@ -1,38 +1,33 @@ + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ - /** - * Elgg reported content: archive action - * - * @package ElggReportedContent - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.org/ - */ +// Make sure we're logged in and are admin +admin_gatekeeper(); - // Make sure we're logged in and are admin - admin_gatekeeper(); +// Get input data +$guid = (int) get_input('item'); - // Get input data - $guid = (int) get_input('item'); - - // Make sure we actually have permission to edit - $report = get_entity($guid); - if ($report->getSubtype() == "reported_content" && $report->canEdit()) { - - // change the state - if (!trigger_plugin_hook('reportedcontent:archive', 'system', array('report'=>$report), true)) { - system_message(elgg_echo("reportedcontent:notarchived")); - forward("pg/reportedcontent/"); - } - $report->state = "archived"; - - // Success message - system_message(elgg_echo("reportedcontent:archived")); - - // Forward back to the reported content page - forward("pg/reportedcontent/"); - - } - -?> \ No newline at end of file +// Make sure we actually have permission to edit +$report = get_entity($guid); +if ($report->getSubtype() == "reported_content" && $report->canEdit()) { + // change the state + if (!trigger_plugin_hook('reportedcontent:archive', 'system', array('report'=>$report), TRUE)) { + system_message(elgg_echo("reportedcontent:notarchived")); + forward('pg/admin/reportedcontent'); + } + $report->state = "archived"; + + // Success message + system_message(elgg_echo("reportedcontent:archived")); + + // Forward back to the reported content page + forward('pg/admin/reportedcontent'); +} diff --git a/mod/reportedcontent/actions/delete.php b/mod/reportedcontent/actions/delete.php index b2e9c7acd..d24000476 100644 --- a/mod/reportedcontent/actions/delete.php +++ b/mod/reportedcontent/actions/delete.php @@ -1,41 +1,37 @@ + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ - /** - * Elgg reported content: delete action - * - * @package ElggReportedCOntent - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.org/ - */ +// Make sure we're logged in and are admin +admin_gatekeeper(); - // Make sure we're logged in and are admin - admin_gatekeeper(); +// Get input data +$guid = (int) get_input('item'); - // Get input data - $guid = (int) get_input('item'); - - // Make sure we actually have permission to edit - $report = get_entity($guid); - if ($report->getSubtype() == "reported_content" && $report->canEdit()) { - - // Delete it! - if (!trigger_plugin_hook('reportedcontent:delete', '$system', array('report'=>$report), true)) { - register_error(elgg_echo("reportedcontent:notdeleted")); - forward("pg/reportedcontent/"); - } - $rowsaffected = $report->delete(); - if ($rowsaffected > 0) { +// Make sure we actually have permission to edit +$report = get_entity($guid); +if ($report->getSubtype() == "reported_content" && $report->canEdit()) { + // Delete it! + if (!trigger_plugin_hook('reportedcontent:delete', '$system', array('report'=>$report), true)) { + register_error(elgg_echo("reportedcontent:notdeleted")); + forward('pg/admin/reportedcontent'); + } + + $rowsaffected = $report->delete(); + if ($rowsaffected > 0) { // Success message - system_message(elgg_echo("reportedcontent:deleted")); - } else { - register_error(elgg_echo("reportedcontent:notdeleted")); - } - - // Forward back to the reported content page - forward("pg/reportedcontent/"); - - } - -?> \ No newline at end of file + system_message(elgg_echo("reportedcontent:deleted")); + } else { + register_error(elgg_echo("reportedcontent:notdeleted")); + } + + // Forward back to the reported content page + forward('pg/admin/reportedcontent'); +} diff --git a/mod/reportedcontent/index.php b/mod/reportedcontent/index.php deleted file mode 100644 index bb969c343..000000000 --- a/mod/reportedcontent/index.php +++ /dev/null @@ -1,27 +0,0 @@ - 'object', 'subtypes' => 'reported_content', 'limit' => 9999)); - -$area2 = elgg_view("reportedcontent/listing", array('entity' => $reported)); - -// Display main admin menu -page_draw(elgg_echo('reportedcontent'),elgg_view_layout("administration", $title . $area2)); \ No newline at end of file diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php index 22d93dbe1..b3266fcba 100644 --- a/mod/reportedcontent/start.php +++ b/mod/reportedcontent/start.php @@ -16,9 +16,6 @@ function reportedcontent_init() { global $CONFIG; - // Register a page handler, so we can have nice URLs - register_page_handler('reportedcontent', 'reportedcontent_page_handler'); - // Extend CSS elgg_extend_view('css', 'reportedcontent/css'); @@ -28,29 +25,13 @@ function reportedcontent_init() { elgg_extend_view('footer/links', 'reportedcontent/footer_link'); } - elgg_add_submenu_item(array( - 'text' => elgg_echo('reportedcontent'), - 'href' => "{$CONFIG->wwwroot}pg/reportedcontent", - 'parent_id' => 'overview', - ), 'admin', 'default'); -} - -/** - * Reported content page handler - * - * @param array $page Array of page elements, forwarded by the page handling mechanism - */ -function reportedcontent_page_handler($page) { - global $CONFIG; + elgg_add_admin_submenu_item('reportedcontent', elgg_echo('reportedcontent'), 'overview'); - // only interested in one page for now - include($CONFIG->pluginspath . "reportedcontent/index.php"); + //register action + register_action('reportedcontent/add', FALSE, "{$CONFIG->pluginspath}reportedcontent/actions/add.php"); + register_action('reportedcontent/delete', FALSE, "{$CONFIG->pluginspath}reportedcontent/actions/delete.php"); + register_action('reportedcontent/archive', FALSE, "{$CONFIG->pluginspath}reportedcontent/actions/archive.php"); } // Initialise Reported Content register_elgg_event_handler('init','system','reportedcontent_init'); - -//register action -register_action('reportedcontent/add',false,$CONFIG->pluginspath . "reportedcontent/actions/add.php"); -register_action('reportedcontent/delete',false,$CONFIG->pluginspath . "reportedcontent/actions/delete.php"); -register_action('reportedcontent/archive',false,$CONFIG->pluginspath . "reportedcontent/actions/archive.php"); \ No newline at end of file diff --git a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php new file mode 100644 index 000000000..4207aacd2 --- /dev/null +++ b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php @@ -0,0 +1,27 @@ + 'object', 'subtypes' => 'reported_content', 'limit' => 9999)); +$list = elgg_view("reportedcontent/listing", array('entity' => $reported)); + +// Display main admin menu +$body = <<<__HTML +$title +$reported +$list +__HTML; + +echo $body; \ No newline at end of file -- cgit v1.2.3