1 files changed, 79 insertions, 37 deletions

diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index e9b86230a..8b18a4d64 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -1,61 +1,103 @@
 <?php
 /**
  * Elgg Reported content.
- * 
+ *
  * @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.com/
  */
 
+elgg_register_event_handler('init', 'system', 'reportedcontent_init');
+
 /**
- * Initialise the Reported content and set up the menus.
- *
+ * Initialize the plugin
  */
 function reportedcontent_init() {
-	global $CONFIG;
-	
+
 	// Register a page handler, so we can have nice URLs
-	register_page_handler('reportedcontent','reportedcontent_page_handler');
+	elgg_register_page_handler('reportedcontent', 'reportedcontent_page_handler');
 	
 	// Extend CSS
-	elgg_extend_view('css','reportedcontent/css');
-			
-	// Extend context menu and owner_block with report content link
-	if (isloggedin()) {
-	    elgg_extend_view('profile/menu/links','reportedcontent/user_report');
-	}
-}
+	elgg_extend_view('css/elgg', 'reportedcontent/css');
+	elgg_extend_view('css/admin', 'reportedcontent/admin_css');
 
-/**
- * Adding the reported content to the admin menu
- *
- */
-function reportedcontent_pagesetup() {
-	if (get_context() == 'admin' && isadminloggedin()) {
-		global $CONFIG;
-		add_submenu_item(elgg_echo('reportedcontent'), $CONFIG->wwwroot . 'pg/reportedcontent/');
+	// Extend footer with report content link
+	if (elgg_is_logged_in()) {
+		$href = "javascript:elgg.forward('reportedcontent/add'";
+		$href .= "+'?address='+encodeURIComponent(location.href)";
+		$href .= "+'&title='+encodeURIComponent(document.title));";
+		
+		elgg_register_menu_item('footer', array(
+			'name' => 'report_this',
+			'href' => $href,
+			'title' => elgg_echo('reportedcontent:this:tooltip'),
+			'text' => elgg_view_icon('report-this') . elgg_echo('reportedcontent:this'),
+			'priority' => 500,
+			'section' => 'alt',
+		));
 	}
+
+	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'reportedcontent_user_hover_menu');
+
+	// Add admin menu item
+	// @todo Might want to move this to a 'feedback' section. something other than utils
+	elgg_register_admin_menu_item('administer', 'reportedcontent', 'administer_utilities');
+
+	elgg_register_widget_type(
+			'reportedcontent',
+			elgg_echo('reportedcontent'),
+			elgg_echo('reportedcontent:widget:description'),
+			'admin');
+
+	// Register actions
+	$action_path = elgg_get_plugins_path() . "reportedcontent/actions/reportedcontent";
+	elgg_register_action('reportedcontent/add', "$action_path/add.php");
+	elgg_register_action('reportedcontent/delete', "$action_path/delete.php", 'admin');
+	elgg_register_action('reportedcontent/archive', "$action_path/archive.php", 'admin');
 }
 
 /**
  * Reported content page handler
  *
- * @param array $page Array of page elements, forwarded by the page handling mechanism
+ * Serves the add report page
+ *
+ * @param array $page Array of page routing elements
+ * @return bool
  */
 function reportedcontent_page_handler($page) {
-	global $CONFIG;
-	
-	// only interested in one page for now
-	include($CONFIG->pluginspath . "reportedcontent/index.php"); 
+	// only logged in users can report things
+	gatekeeper();
+
+	$content .= elgg_view_title(elgg_echo('reportedcontent:this'));
+	$content .= elgg_view_form('reportedcontent/add');
+	$sidebar = elgg_echo('reportedcontent:instructions');
+
+	$params = array(
+		'content' => $content,
+		'sidebar' => $sidebar,
+	);
+	$body = elgg_view_layout('one_sidebar', $params);
+
+	echo elgg_view_page(elgg_echo('reportedcontent:this'), $body);
+	return true;
 }
 
-// Initialise Reported Content
-register_elgg_event_handler('init','system','reportedcontent_init');
-register_elgg_event_handler('pagesetup','system','reportedcontent_pagesetup');
+/**
+ * Add report user link to hover menu
+ */
+function reportedcontent_user_hover_menu($hook, $type, $return, $params) {
+	$user = $params['entity'];
+
+	$profile_url = urlencode($user->getURL());
+	$name = urlencode($user->name);
+	$url = "reportedcontent/add?address=$profile_url&title=$name";
+
+	if (elgg_is_logged_in() && elgg_get_logged_in_user_guid() != $user->guid) {
+		$item = new ElggMenuItem(
+				'reportuser',
+				elgg_echo('reportedcontent:user'),
+				$url);
+		$item->setSection('action');
+		$return[] = $item;
+	}
 
-//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
+	return $return;
+}
\ No newline at end of file