From 710b17aa37dd5c90db695219defdfef7a889f29a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 14 Sep 2011 21:09:48 -0400
Subject: Fixes #3681 fixed Utilities menu collisions in admin section and
 added documentation about registering more than one menu item with the same
 name to a menu

---
 mod/reportedcontent/languages/en.php                        |  2 +-
 mod/reportedcontent/start.php                               |  2 +-
 .../default/admin/administer_utilities/reportedcontent.php  | 13 +++++++++++++
 .../views/default/admin/utilities/reportedcontent.php       | 13 -------------
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
 delete mode 100644 mod/reportedcontent/views/default/admin/utilities/reportedcontent.php

(limited to 'mod/reportedcontent')

diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index c047644e3..c2e197879 100644
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -8,7 +8,7 @@
 $english = array(
 
 	'item:object:reported_content' => 'Reported items',
-	'admin:utilities:reportedcontent' => 'Reported content',
+	'admin:administer_utilities:reportedcontent' => 'Reported content',
 	'reportedcontent' => 'Reported content',
 	'reportedcontent:this' => 'Report this',
 	'reportedcontent:this:tooltip' => 'Report this page to an administrator',
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index 87b4b3c7b..66a1248d9 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -39,7 +39,7 @@ function reportedcontent_init() {
 
 	// 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', 'utilities');
+	elgg_register_admin_menu_item('administer', 'reportedcontent', 'administer_utilities');
 
 	elgg_register_widget_type(
 			'reportedcontent',
diff --git a/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
new file mode 100644
index 000000000..32f108312
--- /dev/null
+++ b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Elgg Reported content admin page
+ *
+ * @package ElggReportedContent
+ */
+
+$list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
+if (!$list) {
+	$list = '<p class="mtm">' . elgg_echo('reportedcontent:none') . '</p>';
+}
+
+echo $list;
\ No newline at end of file
diff --git a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php
deleted file mode 100644
index 32f108312..000000000
--- a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg Reported content admin page
- *
- * @package ElggReportedContent
- */
-
-$list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
-if (!$list) {
-	$list = '<p class="mtm">' . elgg_echo('reportedcontent:none') . '</p>';
-}
-
-echo $list;
\ No newline at end of file
-- 
cgit v1.2.3


From 6074142b6fbcf8834e4a9b1fccdbdb13ede7ab00 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 18:39:27 -0400
Subject: Fixes #3809 updated admin buttons css

---
 .../views/default/forms/logbrowser/refine.php      | 53 ++++++++++++++++++++++
 .../views/default/object/reported_content.php      |  2 +-
 .../views/default/reportedcontent/admin_css.php    |  2 +-
 views/default/css/admin.php                        | 35 ++++++++------
 views/default/forms/admin/plugins/change_state.php |  4 +-
 views/default/forms/admin/plugins/filter.php       |  2 +
 views/default/forms/admin/plugins/sort.php         |  2 +
 7 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 mod/logbrowser/views/default/forms/logbrowser/refine.php

(limited to 'mod/reportedcontent')

diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
new file mode 100644
index 000000000..ff3f48b03
--- /dev/null
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Form body for refining the log browser search.
+ * Look for a particular person or in a time window.
+ *
+ * @uses $vars['user_guid']
+ * @uses $vars['timelower']
+ * @uses $vars['timeupper']
+ */
+
+if (isset($vars['timelower'])) {
+	$lowerval = date('r',$vars['timelower']);
+} else {
+	$lowerval = "";
+}
+if (isset($vars['timeupper'])) {
+	$upperval = date('r',$vars['timeupper']);
+} else {
+	$upperval = "";
+}
+if (isset($vars['user_guid'])) {
+	if ($user = get_entity($vars['user_guid'])) {
+		$userval = $user->username;
+	}
+} else {
+	$userval = "";
+}
+
+
+$form = "<div>" . elgg_echo('logbrowser:user');
+$form .= elgg_view('input/text', array(
+	'name' => 'search_username',
+	'value' => $userval,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:starttime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timelower',
+	'value' => $lowerval,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:endtime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timeupper',
+	'value' => $upperval,
+))  . "</div>";
+$form .= '<div class="elgg-foot">';
+$form .= elgg_view('input/submit', array(
+	'value' => elgg_echo('search'),
+));
+$form .= '</div>';
+
+echo $form;
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 6bcbf6e5d..b0176c11f 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -29,7 +29,7 @@ if ($report->state == 'archived') {
 			'href' => $archive_url,
 			'text' => elgg_echo('reportedcontent:archive'),
 			'is_action' => true,
-			'class' => 'elgg-button elgg-button-action',
+			'class' => 'elgg-button elgg-button-action mrm',
 		);
 		echo elgg_view('output/url', $params);
 	}
diff --git a/mod/reportedcontent/views/default/reportedcontent/admin_css.php b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
index 2eba964a1..1ed240f3b 100644
--- a/mod/reportedcontent/views/default/reportedcontent/admin_css.php
+++ b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
@@ -28,7 +28,7 @@
 }
 .reported-content .controls {
 	float: right;
-	margin: 0 0 0 10px;
+	margin: 5px 0 0 10px;
 }
 .report-details {
 	background-color: white;
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index d6f058eef..e9e489fcb 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -448,45 +448,54 @@ textarea {
 .elgg-input-thin {
 	width: 400px;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
+
+.elgg-button {
 	font-size: 14px;
 	font-weight: bold;
-	color: white;
 	text-decoration: none;
-	background-color: #333;
-	border-color: #333;
-	
+
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 
-	display: inline-block;
 	width: auto;
 	padding: 2px 4px;
-	margin: 10px 5px 10px 0;
 	cursor: pointer;
 	outline: none;
 }
-input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover {
+a.elgg-button {
+	padding: 3px 6px;
+}
+
+.elgg-button-submit,
+.elgg-button-action {
+	color: white;
+	border: 1px solid #333;
+	background-color: #333;
+	text-shadow: 1px 1px 0px black;
+}
+.elgg-button-submit:hover,
+.elgg-button-action:hover {
 	color: white;
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
-	padding: 4px 8px;
+.elgg-button-submit.elgg-state-disabled,
+.elgg-button-action.elgg-state-disabled {
+	color: #999;
+	cursor: default;
 }
+
 .elgg-button-cancel {
 	color: #333;
 	background-color: #999;
+	border: 1px solid #999;
 }
 .elgg-button-cancel:hover {
 	color: #222;
 	background-color: #666;
 	text-decoration: none;
 }
-.elgg-button-action.elgg-state-disabled {
-	background-color: #aaa;
-}
 
 /* **************************************
      DATE PICKER
diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
index ba5d873e7..730c8ff32 100644
--- a/views/default/forms/admin/plugins/change_state.php
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -9,6 +9,7 @@
 $guids = elgg_extract('guids', $vars, array());
 $guids = implode(',', $guids);
 
+echo '<div>';
 echo elgg_view('input/hidden', array(
 	'name' => 'guids',
 	'value' => $guids,
@@ -16,5 +17,6 @@ echo elgg_view('input/hidden', array(
 
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
-	'class' => 'elgg-button elgg-button-action'
+	'class' => 'elgg-button elgg-button-action mrm'
 ));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
index d00906e6a..fd1b618bc 100644
--- a/views/default/forms/admin/plugins/filter.php
+++ b/views/default/forms/admin/plugins/filter.php
@@ -7,6 +7,7 @@
  * @uses $vvars['sort']
  */
 
+echo '<div>';
 echo elgg_view('input/dropdown', array(
 	'name' => 'category',
 	'options_values' => $vars['category_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
 	'value' => elgg_echo('filter'),
 	'class' => 'elgg-button elgg-button-action',
 ));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
index 284e085e6..7f2246bad 100644
--- a/views/default/forms/admin/plugins/sort.php
+++ b/views/default/forms/admin/plugins/sort.php
@@ -7,6 +7,7 @@
  * @uses $vars['category']
  */
 
+echo '<div class="mtm">';
 echo elgg_view('input/dropdown', array(
 	'name' => 'sort',
 	'options_values' => $vars['sort_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
 	'value' => elgg_echo('sort'),
 	'class' => 'elgg-button elgg-button-action'
 ));
+echo '</div>';
-- 
cgit v1.2.3


From 600c18e65f00f0cff6e31f8c3adfaac29ee1fe0d Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 4 Oct 2011 22:52:55 -0400
Subject: Refs #3809 implemented Evan's suggestion for button spacing

---
 mod/reportedcontent/views/default/object/reported_content.php | 2 +-
 views/default/css/admin.php                                   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'mod/reportedcontent')

diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index b0176c11f..6bcbf6e5d 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -29,7 +29,7 @@ if ($report->state == 'archived') {
 			'href' => $archive_url,
 			'text' => elgg_echo('reportedcontent:archive'),
 			'is_action' => true,
-			'class' => 'elgg-button elgg-button-action mrm',
+			'class' => 'elgg-button elgg-button-action',
 		);
 		echo elgg_view('output/url', $params);
 	}
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 7efdf4249..90d151bc6 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -467,6 +467,10 @@ a.elgg-button {
 	padding: 3px 6px;
 }
 
+.elgg-button + .elgg-button {
+	margin-left: 5px;
+}
+
 .elgg-button-submit,
 .elgg-button-action {
 	color: white;
-- 
cgit v1.2.3


From d5f0d44d4ddf33db2248ef0bdd44633d57c31683 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 8 Oct 2011 08:22:08 -0400
Subject: Fixes #3411 output/url now has a is_trusted parameter - defaults to
 false

---
 engine/classes/ElggMenuItem.php                    |  4 +++
 mod/blog/views/default/blog/group_module.php       |  2 ++
 mod/blog/views/default/blog/sidebar/revisions.php  |  6 ++--
 mod/blog/views/default/object/blog.php             |  2 ++
 mod/blog/views/default/widgets/blog/content.php    |  1 +
 .../views/default/bookmarks/group_module.php       |  2 ++
 mod/bookmarks/views/default/object/bookmarks.php   |  9 +++---
 .../views/default/widgets/bookmarks/content.php    |  1 +
 .../views/default/theme_preview/general.php        |  1 +
 .../admin/develop_utilities/diagnostics.php        |  1 +
 mod/file/views/default/file/group_module.php       |  2 ++
 mod/file/views/default/icon/object/file.php        |  1 +
 mod/file/views/default/object/file.php             |  2 ++
 .../views/default/widgets/filerepo/content.php     |  1 +
 .../views/default/discussion/group_module.php      |  2 ++
 .../views/default/groups/invitationrequests.php    |  2 ++
 .../views/default/groups/membershiprequests.php    |  2 ++
 .../default/groups/profile/activity_module.php     |  1 +
 .../views/default/groups/profile/summary.php       |  1 +
 .../views/default/groups/sidebar/members.php       |  1 +
 .../views/default/object/groupforumtopic.php       |  2 ++
 .../default/widgets/a_users_groups/content.php     |  1 +
 mod/likes/views/default/annotation/likes.php       |  1 +
 mod/likes/views/default/likes/button.php           |  2 ++
 mod/logbrowser/views/default/logbrowser/table.php  |  9 ++++--
 .../views/default/widgets/messageboard/content.php |  1 +
 mod/messages/views/default/object/messages.php     |  3 ++
 mod/pages/views/default/annotation/page.php        |  2 ++
 mod/pages/views/default/object/page_top.php        |  2 ++
 mod/pages/views/default/pages/group_module.php     |  2 ++
 mod/pages/views/default/widgets/pages/content.php  |  1 +
 .../views/default/object/reported_content.php      |  8 ++++--
 mod/thewire/views/default/object/thewire.php       |  1 +
 .../views/default/river/object/thewire/create.php  |  2 ++
 .../views/default/thewire/profile_status.php       |  1 +
 .../views/default/widgets/thewire/content.php      |  1 +
 .../forms/twitter_api/interstitial_settings.php    |  1 +
 .../forms/uservalidationbyemail/bulk_action.php    | 21 ++++++++------
 views/default/admin/appearance/default_widgets.php |  1 +
 .../admin/appearance/profile_fields/list.php       |  3 +-
 views/default/admin/header.php                     |  2 ++
 views/default/icon/default.php                     |  1 +
 views/default/icon/user/default.php                |  1 +
 views/default/navigation/breadcrumbs.php           |  1 +
 views/default/navigation/menu/user_hover.php       |  1 +
 views/default/navigation/pagination.php            |  2 ++
 views/default/navigation/tabs.php                  |  6 +++-
 views/default/object/admin_notice.php              |  3 +-
 views/default/object/default.php                   |  1 +
 views/default/object/elements/summary.php          |  1 +
 views/default/object/plugin/advanced.php           | 33 +++++++++++++---------
 views/default/object/plugin/simple.php             |  3 +-
 views/default/object/widget/elements/controls.php  |  1 +
 views/default/output/tag.php                       |  6 +++-
 views/default/output/url.php                       | 15 ++++++++--
 views/default/page/elements/footer.php             |  1 +
 views/default/page/elements/tagcloud_block.php     |  1 +
 views/default/page/layouts/widgets/add_button.php  |  1 +
 views/default/river/elements/body.php              |  2 ++
 views/default/river/elements/responses.php         |  1 +
 views/default/river/elements/summary.php           |  3 ++
 .../river/user/default/profileiconupdate.php       |  1 +
 views/default/river/user/default/profileupdate.php |  1 +
 views/default/widgets/content_stats/content.php    |  1 +
 64 files changed, 157 insertions(+), 41 deletions(-)

(limited to 'mod/reportedcontent')

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index b9c81fd78..8ddb1ecd8 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -549,6 +549,10 @@ class ElggMenuItem {
 			}
 		}
 
+		if (!isset($vars['rel']) && !isset($vars['is_trusted'])) {
+			$vars['is_trusted'] = true;
+		}
+
 		if ($this->confirm) {
 			$vars['confirm'] = $this->confirm;
 			return elgg_view('output/confirmlink', $vars);
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index d769fbd59..028827178 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -12,6 +12,7 @@ if ($group->blog_enable == "no") {
 $all_link = elgg_view('output/url', array(
 	'href' => "blog/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 elgg_push_context('widgets');
@@ -33,6 +34,7 @@ if (!$content) {
 $new_link = elgg_view('output/url', array(
 	'href' => "blog/add/$group->guid",
 	'text' => elgg_echo('blog:write'),
+	'is_trusted' => true,
 ));
 
 echo elgg_view('groups/profile/module', array(
diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index c23b3b052..cd2e7f3d8 100644
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -39,7 +39,8 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		if ($blog->status == 'published') {
 			$load = elgg_view('output/url', array(
 				'href' => $load_base_url,
-				'text' => elgg_echo('blog:status:published')
+				'text' => elgg_echo('blog:status:published'),
+				'is_trusted' => true,
 			));
 
 			$time = "<span class='elgg-subtext'>"
@@ -59,7 +60,8 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 			}
 			$load = elgg_view('output/url', array(
 				'href' => "$load_base_url/$revision->id",
-				'text' => $revision_lang
+				'text' => $revision_lang,
+				'is_trusted' => true,
 			));
 
 			$text = "$load: $time";
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index ba08180b1..ab75bd09b 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -21,6 +21,7 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
 	'href' => "blog/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 $tags = elgg_view('output/tags', array('tags' => $blog->tags));
@@ -35,6 +36,7 @@ if ($blog->comments_on != 'Off') {
 		$comments_link = elgg_view('output/url', array(
 			'href' => $blog->getURL() . '#blog-comments',
 			'text' => $text,
+			'is_trusted' => true,
 		));
 	} else {
 		$comments_link = '';
diff --git a/mod/blog/views/default/widgets/blog/content.php b/mod/blog/views/default/widgets/blog/content.php
index 7bbfc3c74..330171662 100644
--- a/mod/blog/views/default/widgets/blog/content.php
+++ b/mod/blog/views/default/widgets/blog/content.php
@@ -22,6 +22,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $blog_url,
 		'text' => elgg_echo('blog:moreblogs'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index 3797de010..60a727819 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -14,6 +14,7 @@ if ($group->bookmarks_enable == "no") {
 $all_link = elgg_view('output/url', array(
 	'href' => "bookmarks/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 elgg_push_context('widgets');
@@ -35,6 +36,7 @@ if (!$content) {
 $new_link = elgg_view('output/url', array(
 	'href' => "bookmarks/add/$group->guid",
 	'text' => elgg_echo('bookmarks:add'),
+	'is_trusted' => true,
 ));
 
 echo elgg_view('groups/profile/module', array(
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ca1f5d312..784263232 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -17,12 +17,13 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $container = $bookmark->getContainerEntity();
 $categories = elgg_view('output/categories', $vars);
 
-$link = filter_tags(elgg_view('output/url', array('href' => $bookmark->address, 'rel' => 'nofollow')));
+$link = elgg_view('output/url', array('href' => $bookmark->address));
 $description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl'));
 
 $owner_link = elgg_view('output/url', array(
 	'href' => "bookmarks/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 
@@ -36,6 +37,7 @@ if ($comments_count != 0) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $bookmark->getURL() . '#comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
@@ -104,11 +106,10 @@ HTML;
 		}
 	}
 
-	$link = filter_tags(elgg_view('output/url', array(
+	$link = elgg_view('output/url', array(
 		'href' => $bookmark->address,
 		'text' => $display_text,
-		'rel' => 'nofollow',
-	)));
+	));
 
 	$content = elgg_view_icon('push-pin-alt') . "$link{$excerpt}";
 
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/content.php b/mod/bookmarks/views/default/widgets/bookmarks/content.php
index ea7816345..0b85017fc 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/content.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/content.php
@@ -24,6 +24,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('bookmarks:more'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
index 1a0b54c88..35d8ccbfd 100644
--- a/mod/developers/views/default/theme_preview/general.php
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -17,6 +17,7 @@
 		'text' => elgg_echo('theme_preview:breakout'),
 		'href' => current_page_url(),
 		'target' => '_parent',
+		'is_trusted' => true,
 	));
 ?>
 </p>
diff --git a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index 76f12b0ae..b41907da2 100644
--- a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -18,6 +18,7 @@ if (elgg_get_config('debug')) {
 		'text' => elgg_echo('diagnostics:test:executeall'),
 		'href' => 'engine/tests/suite.php',
 		'class' => 'elgg-button elgg-button-submit',
+		'is_trusted' => true,
 	);
 	$unit_tests .= '<p>' . elgg_view('output/url', $params) . '</p>';
 } else {
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index c37b13927..ad6c58dbb 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -12,6 +12,7 @@ if ($group->file_enable == "no") {
 $all_link = elgg_view('output/url', array(
 	'href' => "file/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 elgg_push_context('widgets');
@@ -33,6 +34,7 @@ if (!$content) {
 $new_link = elgg_view('output/url', array(
 	'href' => "file/add/$group->guid",
 	'text' => elgg_echo('file:add'),
+	'is_trusted' => true,
 ));
 
 echo elgg_view('groups/profile/module', array(
diff --git a/mod/file/views/default/icon/object/file.php b/mod/file/views/default/icon/object/file.php
index 7feba7af3..ff729da94 100644
--- a/mod/file/views/default/icon/object/file.php
+++ b/mod/file/views/default/icon/object/file.php
@@ -36,6 +36,7 @@ if ($url) {
 	$params = array(
 		'href' => $url,
 		'text' => $img,
+		'is_trusted' => true,
 	);
 	if (isset($vars['link_class'])) {
 		$params['class'] = $vars['link_class'];
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 95e190d35..fbd585b8a 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -24,6 +24,7 @@ $body = elgg_view('output/longtext', array('value' => $file->description));
 $owner_link = elgg_view('output/url', array(
 	'href' => "file/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 
@@ -39,6 +40,7 @@ if ($comments_count != 0) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $file->getURL() . '#file-comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php
index 4288b9e56..f3e152de3 100644
--- a/mod/file/views/default/widgets/filerepo/content.php
+++ b/mod/file/views/default/widgets/filerepo/content.php
@@ -25,6 +25,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('file:more'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index 3a46e336e..3c9961f82 100644
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -15,6 +15,7 @@ $group = $vars['entity'];
 $all_link = elgg_view('output/url', array(
 	'href' => "discussion/owner/$group->guid",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 elgg_push_context('widgets');
@@ -36,6 +37,7 @@ if (!$content) {
 $new_link = elgg_view('output/url', array(
 	'href' => "discussion/add/" . $group->getGUID(),
 	'text' => elgg_echo('groups:addtopic'),
+	'is_trusted' => true,
 ));
 
 echo elgg_view('groups/profile/module', array(
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 9c2df8b9c..e644b6bdc 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -15,6 +15,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 			$group_title = elgg_view('output/url', array(
 				'href' => $group->getURL(),
 				'text' => $group->name,
+				'is_trusted' => true,
 			));
 
 			$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
@@ -22,6 +23,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 				'href' => $url,
 				'text' => elgg_echo('accept'),
 				'class' => 'elgg-button elgg-button-submit',
+				'is_trusted' => true,
 			));
 
 			$url = "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}";
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 7f33b83e0..489d6f5e3 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -16,6 +16,7 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
 			$user_title = elgg_view('output/url', array(
 				'href' => $user->getURL(),
 				'text' => $user->name,
+				'is_trusted' => true,
 			));
 
 			$url = "action/groups/addtogroup?user_guid={$user->guid}&group_guid={$vars['entity']->guid}";
@@ -24,6 +25,7 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
 				'href' => $url,
 				'text' => elgg_echo('accept'),
 				'class' => 'elgg-button elgg-button-submit',
+				'is_trusted' => true,
 			));
 
 			$url = 'action/groups/killrequest?user_guid=' . $user->guid . '&group_guid=' . $vars['entity']->guid;
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 5e557b443..832ff4a4b 100644
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -19,6 +19,7 @@ if (!$group) {
 $all_link = elgg_view('output/url', array(
 	'href' => "groups/activity/$group->guid",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 
diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php
index b7ae51070..54abcb1e5 100644
--- a/mod/groups/views/default/groups/profile/summary.php
+++ b/mod/groups/views/default/groups/profile/summary.php
@@ -28,6 +28,7 @@ $owner = $group->getOwnerEntity();
 					echo elgg_view('output/url', array(
 						'text' => $owner->name,
 						'value' => $owner->getURL(),
+						'is_trusted' => true,
 					));
 				?>
 			</p>
diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 7249ffbf4..49f14697c 100644
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -13,6 +13,7 @@ $limit = elgg_extract('limit', $vars, 10);
 $all_link = elgg_view('output/url', array(
 	'href' => 'groups/members/' . $vars['entity']->guid,
 	'text' => elgg_echo('groups:members:more'),
+	'is_trusted' => true,
 ));
 
 $body = elgg_list_entities_from_relationship(array(
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 22589b84d..f3d5f96d5 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -20,6 +20,7 @@ $poster_icon = elgg_view_entity_icon($poster, 'tiny');
 $poster_link = elgg_view('output/url', array(
 	'href' => $poster->getURL(),
 	'text' => $poster->name,
+	'is_trusted' => true,
 ));
 $poster_text = elgg_echo('groups:started', array($poster->name));
 
@@ -42,6 +43,7 @@ if ($num_replies != 0) {
 	$replies_link = elgg_view('output/url', array(
 		'href' => $topic->getURL() . '#group-replies',
 		'text' => elgg_echo('group:replies') . " ($num_replies)",
+		'is_trusted' => true,
 	));
 }
 
diff --git a/mod/groups/views/default/widgets/a_users_groups/content.php b/mod/groups/views/default/widgets/a_users_groups/content.php
index 114fd7565..fe1a46e39 100644
--- a/mod/groups/views/default/widgets/a_users_groups/content.php
+++ b/mod/groups/views/default/widgets/a_users_groups/content.php
@@ -25,6 +25,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('groups:more'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php
index 2dd01b6cd..314d0790d 100644
--- a/mod/likes/views/default/annotation/likes.php
+++ b/mod/likes/views/default/annotation/likes.php
@@ -20,6 +20,7 @@ $user_icon = elgg_view_entity_icon($user, 'tiny');
 $user_link = elgg_view('output/url', array(
 	'href' => $user->getURL(),
 	'text' => $user->name,
+	'is_trusted' => true,
 ));
 
 $likes_string = elgg_echo('likes:this');
diff --git a/mod/likes/views/default/likes/button.php b/mod/likes/views/default/likes/button.php
index 383e1bb63..3f2f073cc 100644
--- a/mod/likes/views/default/likes/button.php
+++ b/mod/likes/views/default/likes/button.php
@@ -20,6 +20,7 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 			'text' => elgg_view_icon('thumbs-up'),
 			'title' => elgg_echo('likes:likethis'),
 			'is_action' => true,
+			'is_trusted' => true,
 		);
 		$likes_button = elgg_view('output/url', $params);
 	} else {
@@ -34,6 +35,7 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 			'text' => elgg_view_icon('thumbs-up-alt'),
 			'title' => elgg_echo('likes:remove'),
 			'is_action' => true,
+			'is_trusted' => true,
 		);
 		$likes_button = elgg_view('output/url', $params);
 	}
diff --git a/mod/logbrowser/views/default/logbrowser/table.php b/mod/logbrowser/views/default/logbrowser/table.php
index 86c8a1423..b7f6a1f20 100644
--- a/mod/logbrowser/views/default/logbrowser/table.php
+++ b/mod/logbrowser/views/default/logbrowser/table.php
@@ -24,11 +24,13 @@ $log_entries = $vars['log_entries'];
 		if ($user) {
 			$user_link = elgg_view('output/url', array(
 				'href' => $user->getURL(),
-				'text' => $user->name
+				'text' => $user->name,
+				'is_trusted' => true,
 			));
 			$user_guid_link = elgg_view('output/url', array(
 				'href' => "admin/overview/logbrowser?user_guid=$user->guid",
-				'text' => $user->getGUID()
+				'text' => $user->getGUID(),
+				'is_trusted' => true,
 			));
 		} else {
 			$user_guid_link = $user_link = '&nbsp;';
@@ -38,7 +40,8 @@ $log_entries = $vars['log_entries'];
 		if (is_callable(array($object, 'getURL'))) {
 			$object_link = elgg_view('output/url', array(
 				'href' => $object->getURL(),
-				'text' => $entry->object_class
+				'text' => $entry->object_class,
+				'is_trusted' => true,
 			));
 		} else {
 			$object_link = $entry->object_class;
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 63f389e6a..35954e7a3 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -31,4 +31,5 @@ if ($owner instanceof ElggGroup) {
 echo elgg_view('output/url', array(
 	'href' => $url,
 	'text' => elgg_echo('messageboard:viewall'),
+	'is_trusted' => true,
 ));
\ No newline at end of file
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index b6f9ed6d5..8c840dd57 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -24,6 +24,7 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 		$user_link = elgg_view('output/url', array(
 			'href' => "messages/compose?send_to=$user->guid",
 			'text' => $user->name,
+			'is_trusted' => true,
 		));
 	} else {
 		$icon = '';
@@ -45,6 +46,7 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 		$user_link = elgg_view('output/url', array(
 			'href' => "messages/compose?send_to=$user->guid",
 			'text' => elgg_echo('messages:to_user', array($user->name)),
+			'is_trusted' => true,
 		));
 	} else {
 		$icon = '';
@@ -63,6 +65,7 @@ if (!$full) {
 $subject_info .= elgg_view('output/url', array(
 	'href' => $message->getURL(),
 	'text' => $message->title,
+	'is_trusted' => true,
 ));
 
 $delete_link = elgg_view("output/confirmlink", array(
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index f7a7a78a1..a621b9281 100644
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -21,6 +21,7 @@ if (!$owner) {
 $owner_link = elgg_view('output/url', array(
 	'href' => $owner->getURL(),
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 
 $date = elgg_view_friendly_time($annotation->time_created);
@@ -28,6 +29,7 @@ $date = elgg_view_friendly_time($annotation->time_created);
 $title_link = elgg_view('output/url', array(
 	'href' => $annotation->getURL(),
 	'text' => $page->title,
+	'is_trusted' => true,
 ));
 
 $subtitle = elgg_echo('pages:revision:subtitle', array($date, $owner_link));
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 8ba9fc298..0f7b51a0e 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -40,6 +40,7 @@ $editor = get_entity($annotation->owner_guid);
 $editor_link = elgg_view('output/url', array(
 	'href' => "pages/owner/$editor->username",
 	'text' => $editor->name,
+	'is_trusted' => true,
 ));
 
 $date = elgg_view_friendly_time($annotation->time_created);
@@ -53,6 +54,7 @@ if ($comments_count != 0 && !$revision) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $page->getURL() . '#page-comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 7e2656ca3..0d7df96ac 100644
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -15,6 +15,7 @@ if ($group->pages_enable == "no") {
 $all_link = elgg_view('output/url', array(
 	'href' => "pages/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
 
@@ -37,6 +38,7 @@ if (!$content) {
 $new_link = elgg_view('output/url', array(
 	'href' => "pages/add/$group->guid",
 	'text' => elgg_echo('pages:add'),
+	'is_trusted' => true,
 ));
 
 echo elgg_view('groups/profile/module', array(
diff --git a/mod/pages/views/default/widgets/pages/content.php b/mod/pages/views/default/widgets/pages/content.php
index 3ae0b8454..f63777c09 100644
--- a/mod/pages/views/default/widgets/pages/content.php
+++ b/mod/pages/views/default/widgets/pages/content.php
@@ -24,6 +24,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('pages:more'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 6bcbf6e5d..0e733e154 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -29,6 +29,7 @@ if ($report->state == 'archived') {
 			'href' => $archive_url,
 			'text' => elgg_echo('reportedcontent:archive'),
 			'is_action' => true,
+			'is_trusted' => true,
 			'class' => 'elgg-button elgg-button-action',
 		);
 		echo elgg_view('output/url', $params);
@@ -37,6 +38,7 @@ if ($report->state == 'archived') {
 		'href' => $delete_url,
 		'text' => elgg_echo('reportedcontent:delete'),
 		'is_action' => true,
+		'is_trusted' => true,
 		'class' => 'elgg-button elgg-button-action',
 	);
 	echo elgg_view('output/url', $params);
@@ -46,7 +48,8 @@ if ($report->state == 'archived') {
 			<b><?php echo elgg_echo('reportedcontent:by'); ?>:</b>
 			<?php echo elgg_view('output/url', array(
 				'href' => $reporter->getURL(),
-				'text' => $reporter->name
+				'text' => $reporter->name,
+				'is_trusted' => true,
 			));
 			?>,
 			<?php echo elgg_view_friendly_time($report->time_created); ?>
@@ -68,7 +71,8 @@ if ($report->state == 'archived') {
 			<b><?php echo elgg_echo('reportedcontent:objecturl'); ?>:</b>
 			<?php echo elgg_view('output/url', array(
 				'href' => $report->address,
-				'text' => elgg_echo('reportedcontent:visit')
+				'text' => elgg_echo('reportedcontent:visit'),
+				'is_trusted' => true,
 			));
 			?>
 		</p>
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 2727df60d..134c87243 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -26,6 +26,7 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 $date = elgg_view_friendly_time($post->time_created);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index c3c434858..fbf592664 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -12,12 +12,14 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $object_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$subject->username",
 	'text' => elgg_echo('thewire:wire'),
 	'class' => 'elgg-river-object',
+	'is_trusted' => true,
 ));
 
 $summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 6ab47bccb..ab20b5341 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -28,6 +28,7 @@ if ($latest_wire && count($latest_wire) > 0) {
 			'text' => elgg_echo('thewire:update'),
 			'href' => $url_to_wire,
 			'class' => 'elgg-button elgg-button-action right',
+			'is_trusted' => true,
 		));
 	}
 
diff --git a/mod/thewire/views/default/widgets/thewire/content.php b/mod/thewire/views/default/widgets/thewire/content.php
index 835a328b0..7212d4397 100644
--- a/mod/thewire/views/default/widgets/thewire/content.php
+++ b/mod/thewire/views/default/widgets/thewire/content.php
@@ -22,6 +22,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $owner_url,
 		'text' => elgg_echo('thewire:moreposts'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
index fdeafd46d..2592013c6 100644
--- a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
+++ b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
@@ -58,4 +58,5 @@ echo elgg_view('output/url', array(
 	'class' => 'right',
 	'text' => elgg_echo('twitter_api:interstitial:no_thanks'),
 	'href' => '/',
+	'is_trusted' => true,
 ));
\ No newline at end of file
diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index 2872b7a0c..0e1461058 100644
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -52,27 +52,30 @@ $bulk_actions_checkbox = '<label><input type="checkbox" class="unvalidated-users
 	. elgg_echo('uservalidationbyemail:check_all') . '</label>';
 
 $validate = elgg_view('output/url', array(
-	'is_action' => TRUE,
-	'js' => 'title="' . elgg_echo('uservalidationbyemail:confirm_validate_checked') . '"',
-	'href' => $vars['url'] . "action/uservalidationbyemail/validate/",
+	'href' => 'action/uservalidationbyemail/validate/',
 	'text' => elgg_echo('uservalidationbyemail:admin:validate'),
+	'title' => elgg_echo('uservalidationbyemail:confirm_validate_checked'),
 	'class' => 'unvalidated-users-bulk-post',
+	'is_action' => true,
+	'is_trusted' => true,
 ));
 
 $resend_email = elgg_view('output/url', array(
-	'is_action' => TRUE,
-	'js' => 'title="' . elgg_echo('uservalidationbyemail:confirm_resend_validation_checked') . '"',
-	'href' => $vars['url'] . "action/uservalidationbyemail/resend_validation/",
+	'href' => 'action/uservalidationbyemail/resend_validation/',
 	'text' => elgg_echo('uservalidationbyemail:admin:resend_validation'),
+	'title' => elgg_echo('uservalidationbyemail:confirm_resend_validation_checked'),
 	'class' => 'unvalidated-users-bulk-post',
+	'is_action' => true,
+	'is_trusted' => true,
 ));
 
 $delete = elgg_view('output/url', array(
-	'is_action' => TRUE,
-	'js' => 'title="' . elgg_echo('uservalidationbyemail:confirm_delete_checked') . '"',
-	'href' => $vars['url'] . "action/uservalidationbyemail/delete/",
+	'href' => 'action/uservalidationbyemail/delete/',
 	'text' => elgg_echo('uservalidationbyemail:admin:delete'),
+	'title' => elgg_echo('uservalidationbyemail:confirm_delete_checked'),
 	'class' => 'unvalidated-users-bulk-post',
+	'is_action' => true,
+	'is_trusted' => true,
 ));
 
 $bulk_actions = <<<___END
diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/appearance/default_widgets.php
index 4416dc8f6..1bf5791ac 100644
--- a/views/default/admin/appearance/default_widgets.php
+++ b/views/default/admin/appearance/default_widgets.php
@@ -17,6 +17,7 @@ if ($object) {
 		'text' => elgg_echo('upgrade'),
 		'href' => 'action/widgets/upgrade',
 		'is_action' => true,
+		'is_trusted' => true,
 		'class' => 'elgg_button elgg-button-submit',
 		'title' => 'Upgrade your default widgets to work on Elgg 1.8',
 	));
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 6e79838ea..f4ff1e986 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -39,8 +39,9 @@ foreach ($items as $item) {
 	//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 	$url = elgg_view('output/url', array(
 		'href' => "action/profile/fields/delete?id={$item->shortname}",
-		'is_action' => TRUE,
 		'text' => elgg_view_icon('delete-alt'),
+		'is_action' => true,
+		'is_trusted' => true,
 	));
 	$type = elgg_echo($item->type);
 	echo <<<HTML
diff --git a/views/default/admin/header.php b/views/default/admin/header.php
index 3919c017e..331190a88 100644
--- a/views/default/admin/header.php
+++ b/views/default/admin/header.php
@@ -7,10 +7,12 @@ $admin_title = elgg_get_site_entity()->name . ' ' . elgg_echo('admin');
 $view_site = elgg_view('output/url', array(
 	'href' => elgg_get_site_url(),
 	'text' => elgg_echo('admin:view_site'),
+	'is_trusted' => true,
 ));
 $logout = elgg_view('output/url', array(
 	'href' => 'action/logout',
 	'text' => elgg_echo('logout'),
+	'is_trusted' => true,
 ));
 ?>
 <h1 class="elgg-heading-site">
diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index 3abd96b96..533b92c43 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -39,6 +39,7 @@ if ($url) {
 	echo elgg_view('output/url', array(
 		'href' => $url,
 		'text' => $img,
+		'is_trusted' => true,
 	));
 } else {
 	echo $img;
diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index aca03521f..0eb3691bd 100644
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -66,6 +66,7 @@ if ($show_menu) {
 echo elgg_view('output/url', array(
 	'href' => $user->getURL(),
 	'text' => $icon,
+	'is_trusted' => true,
 ));
 ?>
 </div>
diff --git a/views/default/navigation/breadcrumbs.php b/views/default/navigation/breadcrumbs.php
index bad73c4b3..88577a8ff 100644
--- a/views/default/navigation/breadcrumbs.php
+++ b/views/default/navigation/breadcrumbs.php
@@ -30,6 +30,7 @@ if (is_array($breadcrumbs) && count($breadcrumbs) > 0) {
 			$crumb = elgg_view('output/url', array(
 				'href' => $breadcrumb['link'],
 				'text' => $breadcrumb['title'],
+				'is_trusted' => true,
 			));
 		} else {
 			$crumb = $breadcrumb['title'];
diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php
index e32e5ab57..5c89e585c 100644
--- a/views/default/navigation/menu/user_hover.php
+++ b/views/default/navigation/menu/user_hover.php
@@ -19,6 +19,7 @@ echo '<ul class="elgg-menu elgg-menu-hover">';
 $name_link = elgg_view('output/url', array(
 	'href' => $user->getURL(),
 	'text' => "<span class=\"elgg-heading-basic\">$user->name</span>&#64;$user->username",
+	'is_trusted' => true,
 ));
 echo "<li>$name_link</li>";
 
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index c0cb801dd..4df5cf575 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -42,10 +42,12 @@ $pages = new stdClass();
 $pages->prev = array(
 	'text' => '&laquo; ' . elgg_echo('previous'),
 	'href' => '',
+	'is_trusted' => true,
 );
 $pages->next = array(
 	'text' => elgg_echo('next') . ' &raquo;',
 	'href' => '',
+	'is_trusted' => true,
 );
 $pages->items = array();
 
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php
index 0108126ad..e8fde3579 100644
--- a/views/default/navigation/tabs.php
+++ b/views/default/navigation/tabs.php
@@ -47,7 +47,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 		$options = array(
 			'href' => $url,
 			'title' => $title,
-			'text' => $title
+			'text' => $title,
 		);
 
 		if (isset($info['url_class'])) {
@@ -58,6 +58,10 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 			$options['id'] = $info['url_id'];
 		}
 
+		if (!isset($info['rel']) && !isset($info['is_trusted'])) {
+			$options['is_trusted'] = true;
+		}
+
 		$link = elgg_view('output/url', $options);
 
 		echo "<li $class_str $js>$link</li>";
diff --git a/views/default/object/admin_notice.php b/views/default/object/admin_notice.php
index 086eddb1f..11524567e 100644
--- a/views/default/object/admin_notice.php
+++ b/views/default/object/admin_notice.php
@@ -11,7 +11,8 @@ if (isset($vars['entity']) && elgg_instanceof($vars['entity'], 'object', 'admin_
 		'href' => "action/admin/delete_admin_notice?guid=$notice->guid",
 		'text' => '<span class="elgg-icon elgg-icon-delete"></span>',
 		'is_action' => true,
-		'class' => 'elgg-admin-notice'
+		'class' => 'elgg-admin-notice',
+		'is_trusted' => true,
 	));
 
 	echo "<p>$delete$message</p>";
diff --git a/views/default/object/default.php b/views/default/object/default.php
index a50f19387..a9c3e15ca 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -28,6 +28,7 @@ if ($owner) {
 	$owner_link = elgg_view('output/url', array(
 		'href' => $owner->getURL(),
 		'text' => $owner->name,
+		'is_trusted' => true,
 	));
 }
 
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 10cf0b148..3ca4de2be 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -29,6 +29,7 @@ if ($title_link === '') {
 	$params = array(
 		'text' => $text,
 		'href' => $entity->getURL(),
+		'is_trusted' => true,
 	);
 	$title_link = elgg_view('output/url', $params);
 }
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 1fabaff04..db4e4dbcc 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -40,9 +40,10 @@ if ($reordering) {
 		));
 
 		$links .= "<li>" . elgg_view('output/url', array(
-			'href' 		=> $top_url,
-			'text'		=> elgg_echo('top'),
-			'is_action'	=> true
+			'href' => $top_url,
+			'text' => elgg_echo('top'),
+			'is_action' => true,
+			'is_trusted' => true,
 		)) . "</li>";
 
 		$up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
@@ -52,9 +53,10 @@ if ($reordering) {
 		));
 
 		$links .= "<li>" . elgg_view('output/url', array(
-			'href' 		=> $up_url,
-			'text'		=> elgg_echo('up'),
-			'is_action'	=> true
+			'href' => $up_url,
+			'text' => elgg_echo('up'),
+			'is_action' => true,
+			'is_trusted' => true,
 		)) . "</li>";
 	}
 
@@ -67,9 +69,10 @@ if ($reordering) {
 		));
 
 		$links .= "<li>" . elgg_view('output/url', array(
-			'href' 		=> $down_url,
-			'text'		=> elgg_echo('down'),
-			'is_action'	=> true
+			'href' => $down_url,
+			'text' => elgg_echo('down'),
+			'is_action'	=> true,
+			'is_trusted' => true,
 		)) . "</li>";
 
 		$bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
@@ -81,7 +84,8 @@ if ($reordering) {
 		$links .= "<li>" . elgg_view('output/url', array(
 			'href' 		=> $bottom_url,
 			'text'		=> elgg_echo('bottom'),
-			'is_action'	=> true
+			'is_action'	=> true,
+			'is_trusted' => true,
 		)) . "</li>";
 	}
 } else {
@@ -93,7 +97,8 @@ if ($reordering) {
 
 // always let them deactivate
 $options = array(
-	'is_action' => true
+	'is_action' => true,
+	'is_trusted' => true,
 );
 if ($active) {
 	$active_class = 'elgg-state-active';
@@ -163,7 +168,8 @@ $author = '<span>' . elgg_echo('admin:plugins:label:author') . '</span>: '
 $version = htmlspecialchars($plugin->getManifest()->getVersion());
 $website = elgg_view('output/url', array(
 	'href' => $plugin->getManifest()->getWebsite(),
-	'text' => $plugin->getManifest()->getWebsite()
+	'text' => $plugin->getManifest()->getWebsite(),
+	'is_trusted' => true,
 ));
 
 $copyright = elgg_view('output/text', array('value' => $plugin->getManifest()->getCopyright()));
@@ -179,7 +185,8 @@ if ($files) {
 		$url = 'admin_plugin_text_file/' . $plugin->getID() . "/$file";
 		$link = elgg_view('output/url', array(
 			'text' => $file,
-			'href' => $url
+			'href' => $url,
+			'is_trusted' => true,
 		));
 		$docs .= "<li>$link</li>";
 
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index f4cc944f4..4d392e71a 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -49,7 +49,8 @@ foreach ($files as $file => $path) {
 	$url = 'admin_plugin_text_file/' . $plugin->getID() . "/$file";
 	$link = elgg_view('output/url', array(
 		'text' => $file,
-		'href' => $url
+		'href' => $url,
+		'is_trusted' => true,
 	));
 	$plugin_footer .= "<li>$link</li>";
 
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index abf2154fc..6d06d28bc 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -24,6 +24,7 @@ if ($widget->canEdit()) {
 		'title' => elgg_echo('widget:delete', array($widget->getTitle())),
 		'href' => "action/widgets/delete?guid=$widget->guid",
 		'is_action' => true,
+		'is_trusted' => true,
 		'class' => 'elgg-widget-delete-button',
 		'id' => "elgg-widget-delete-button-$widget->guid"
 	);
diff --git a/views/default/output/tag.php b/views/default/output/tag.php
index abae9c4b2..3c002a31b 100644
--- a/views/default/output/tag.php
+++ b/views/default/output/tag.php
@@ -26,5 +26,9 @@ if (isset($vars['value'])) {
 		$type = "";
 	}
 	$url = elgg_get_site_url() . 'search?q=' . urlencode($vars['value']) . "&search_type=tags{$type}{$subtype}{$object}";
-	echo elgg_view('output/url', array('href' => $url, 'text' => $vars['value'], 'rel' => 'tag'));
+	echo elgg_view('output/url', array(
+		'href' => $url,
+		'text' => $vars['value'],
+		'rel' => 'tag',
+	));
 }
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 79ab52377..81b02087d 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -10,7 +10,7 @@
  * @uses string $vars['href']        The unencoded url string
  * @uses bool   $vars['encode_text'] Run $vars['text'] through htmlspecialchars() (false)
  * @uses bool   $vars['is_action']   Is this a link to an action (false)
- *
+ * @uses bool   $vars['is_trusted']  Is this link trusted (false)
  */
 
 $url = elgg_extract('href', $vars, null);
@@ -37,11 +37,20 @@ if ($url) {
 
 	if (elgg_extract('is_action', $vars, false)) {
 		$url = elgg_add_action_tokens_to_url($url, false);
-		unset($vars['is_action']);
+	}
+
+	if (!elgg_extract('is_trusted', $vars, false)) {
+		if (!isset($vars['rel'])) {
+			$vars['rel'] = 'nofollow';
+			$url = strip_tags($url);
+		}
 	}
 
 	$vars['href'] = $url;
 }
 
+unset($vars['is_action']);
+unset($vars['is_trusted']);
+
 $attributes = elgg_format_attributes($vars);
-echo "<a $attributes>$text</a>";
\ No newline at end of file
+echo "<a $attributes>$text</a>";
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 06fdb84a5..596d17bd3 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -17,5 +17,6 @@ echo elgg_view('output/url', array(
 	'href' => 'http://elgg.org',
 	'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
 	'class' => '',
+	'is_trusted' => true,
 ));
 echo '</div>';
diff --git a/views/default/page/elements/tagcloud_block.php b/views/default/page/elements/tagcloud_block.php
index 8b67c9e37..258951c41 100644
--- a/views/default/page/elements/tagcloud_block.php
+++ b/views/default/page/elements/tagcloud_block.php
@@ -50,6 +50,7 @@ $cloud .= elgg_view_icon('tag');
 $cloud .= elgg_view('output/url', array(
 	'href' => 'tags',
 	'text' => elgg_echo('tagcloud:allsitetags'),
+	'is_trusted' => true,
 ));
 $cloud .= '</p>';
 
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 89e83b096..c33a45f99 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -10,6 +10,7 @@
 		'text' => elgg_echo('widgets:add'),
 		'class' => 'elgg-button elgg-button-action',
 		'rel' => 'toggle',
+		'is_trusted' => true,
 	));
 ?>
 </div>
diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index c5a525733..6894b81e2 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -27,6 +27,7 @@ if ($summary === false) {
 		'href' => $subject->getURL(),
 		'text' => $subject->name,
 		'class' => 'elgg-river-subject',
+		'is_trusted' => true,
 	));
 }
 
@@ -52,6 +53,7 @@ if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_g
 	$group_link = elgg_view('output/url', array(
 		'href' => $container->getURL(),
 		'text' => $container->name,
+		'is_trusted' => true,
 	));
 	$group_string = elgg_echo('river:ingroup', array($group_link));
 }
diff --git a/views/default/river/elements/responses.php b/views/default/river/elements/responses.php
index 8c5be6316..f6c32e142 100644
--- a/views/default/river/elements/responses.php
+++ b/views/default/river/elements/responses.php
@@ -50,6 +50,7 @@ if ($comments) {
 		$params = array(
 			'href' => $url,
 			'text' => elgg_echo('river:comments:more', array($num_more_comments)),
+			'is_trusted' => true,
 		);
 		$link = elgg_view('output/url', $params);
 		echo "<div class=\"elgg-river-more\">$link</div>";
diff --git a/views/default/river/elements/summary.php b/views/default/river/elements/summary.php
index 4d80c29a6..84941131f 100644
--- a/views/default/river/elements/summary.php
+++ b/views/default/river/elements/summary.php
@@ -15,12 +15,14 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $object_link = elgg_view('output/url', array(
 	'href' => $object->getURL(),
 	'text' => $object->title ? $object->title : $object->name,
 	'class' => 'elgg-river-object',
+	'is_trusted' => true,
 ));
 
 $action = $item->action_type;
@@ -32,6 +34,7 @@ if ($container instanceof ElggGroup) {
 	$params = array(
 		'href' => $container->getURL(),
 		'text' => $container->name,
+		'is_trusted' => true,
 	);
 	$group_link = elgg_view('output/url', $params);
 	$group_string = elgg_echo('river:ingroup', array($group_link));
diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php
index c7f691533..5c96747bd 100644
--- a/views/default/river/user/default/profileiconupdate.php
+++ b/views/default/river/user/default/profileiconupdate.php
@@ -10,6 +10,7 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $string = elgg_echo('river:update:user:avatar', array($subject_link));
diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php
index a344131d6..69b69b106 100644
--- a/views/default/river/user/default/profileupdate.php
+++ b/views/default/river/user/default/profileupdate.php
@@ -9,6 +9,7 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $string = elgg_echo('river:update:user:profile', array($subject_link));
diff --git a/views/default/widgets/content_stats/content.php b/views/default/widgets/content_stats/content.php
index 6a652166c..56772047d 100644
--- a/views/default/widgets/content_stats/content.php
+++ b/views/default/widgets/content_stats/content.php
@@ -23,5 +23,6 @@ echo '<div class="mtm">';
 echo elgg_view('output/url', array(
 	'href' => 'admin/statistics/overview',
 	'text' => elgg_echo('more'),
+	'is_trusted' => true,
 ));
 echo '</div>';
-- 
cgit v1.2.3


From 96604b6836edc0ee2f9bfc58fdbaedf19a6f099c Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 13 Oct 2011 22:08:26 -0700
Subject: Fixes #3917. Removed uses of admin interface in manifests. Removed
 related code.

---
 actions/admin/plugins/simple_update_states.php | 48 --------------------------
 documentation/examples/plugins/manifest.xml    |  4 ---
 engine/classes/ElggPluginManifest.php          | 18 ----------
 engine/classes/ElggPluginManifestParser18.php  |  3 +-
 engine/lib/admin.php                           |  2 --
 engine/tests/api/plugins.php                   |  5 ---
 engine/tests/test_files/plugin_18/manifest.xml |  1 -
 languages/en.php                               |  5 ---
 mod/blog/manifest.xml                          |  1 -
 mod/bookmarks/manifest.xml                     |  1 -
 mod/categories/manifest.xml                    |  1 -
 mod/custom_index/manifest.xml                  |  1 -
 mod/dashboard/manifest.xml                     |  3 +-
 mod/developers/manifest.xml                    |  3 --
 mod/diagnostics/manifest.xml                   |  1 -
 mod/embed/manifest.xml                         |  1 -
 mod/externalpages/manifest.xml                 |  1 -
 mod/file/manifest.xml                          |  1 -
 mod/garbagecollector/manifest.xml              |  1 -
 mod/groups/manifest.xml                        |  1 -
 mod/htmlawed/manifest.xml                      |  1 -
 mod/invitefriends/manifest.xml                 |  1 -
 mod/likes/manifest.xml                         |  3 +-
 mod/logbrowser/manifest.xml                    |  1 -
 mod/logrotate/manifest.xml                     |  1 -
 mod/members/manifest.xml                       |  3 +-
 mod/messageboard/manifest.xml                  |  1 -
 mod/messages/manifest.xml                      |  1 -
 mod/notifications/manifest.xml                 |  1 -
 mod/pages/manifest.xml                         |  1 -
 mod/profile/manifest.xml                       |  1 -
 mod/reportedcontent/manifest.xml               |  1 -
 mod/search/manifest.xml                        |  1 -
 mod/tagcloud/manifest.xml                      |  1 -
 mod/thewire/manifest.xml                       |  1 -
 mod/tinymce/manifest.xml                       |  1 -
 mod/twitter/manifest.xml                       |  1 -
 mod/uservalidationbyemail/manifest.xml         |  1 -
 mod/zaudio/manifest.xml                        |  1 -
 39 files changed, 4 insertions(+), 121 deletions(-)
 delete mode 100644 actions/admin/plugins/simple_update_states.php

(limited to 'mod/reportedcontent')

diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php
deleted file mode 100644
index 7601013a7..000000000
--- a/actions/admin/plugins/simple_update_states.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Bulk activate/deactivate for plugins appearing in the "simple" interface.
- *
- * Plugins marked as using the "simple" interface can be activated/deactivated
- * en masse by passing the plugins to activate as an array of their plugin guids
- * in $_REQUEST['enabled_plugins'].  All "simple" plugins not in this array will be
- * deactivated.
- *
- * Simplecache and views cache are reset.
- *
- * @uses array $_REQUEST['activated_plugin_guids'] Array of plugin guids to activate.
- *
- * @since 1.8
- * @package Elgg.Core
- * @subpackage Administration.Plugins
- */
-
-$active_plugin_guids = get_input('active_plugin_guids', array());
-$installed_plugins = elgg_get_plugins('any');
-$success = TRUE;
-
-foreach ($installed_plugins as $plugin) {
-	// this is only for simple plugins.
-	if ($plugin->getManifest()->getAdminInterface() != 'simple') {
-		continue;
-	}
-
-	// only effect changes to plugins not already in that state.
-	if ($plugin->isActive() && !in_array($plugin->guid, $active_plugin_guids)) {
-		$success = $success && $plugin->deactivate();
-	} elseif (!$plugin->isActive()  && in_array($plugin->guid, $active_plugin_guids)) {
-		$success = $success && $plugin->activate();
-	}
-}
-
-if ($success) {
-	//system_message(elgg_echo('admin:plugins:simple_simple_success'));
-} else {
-	register_error(elgg_echo('admin:plugins:simple_simple_fail'));
-}
-
-// don't regenerate the simplecache because the plugin won't be
-// loaded until next run.  Just invalidate and let it regnerate as needed
-elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
-
-forward(REFERER);
\ No newline at end of file
diff --git a/documentation/examples/plugins/manifest.xml b/documentation/examples/plugins/manifest.xml
index 1602a7358..2a8a2bd5c 100644
--- a/documentation/examples/plugins/manifest.xml
+++ b/documentation/examples/plugins/manifest.xml
@@ -32,10 +32,6 @@
 	<category>admin</category>
 	<category>api</category>
 
-	<on_enable>setup_function</on_enable>
-	<on_disable>teardown_function</on_disable>
-	<admin_interface>simple</admin_interface>
-
 	<requires>
 		<type>php_extension</type>
 		<name>gd</name>
diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 0e47f388d..eacc16455 100644
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -552,24 +552,6 @@ class ElggPluginManifest {
 		return $normalized;
 	}
 
-	/**
-	 * Returns the admin interface to use.
-	 *
-	 *  @return string simple or advanced
-	 */
-	public function getAdminInterface() {
-		$interface = $this->parser->getAttribute('admin_interface');
-
-		switch ($interface) {
-			case 'simple':
-			case 'advanced':
-				return $interface;
-
-			default:
-				return 'advanced';
-		}
-	}
-
 	/**
 	 * Returns the admin interface to use.
 	 *
diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php
index db8b3dc6a..554e28c02 100644
--- a/engine/classes/ElggPluginManifestParser18.php
+++ b/engine/classes/ElggPluginManifestParser18.php
@@ -16,7 +16,7 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
 		'name', 'author', 'version', 'blurb', 'description',
 		'website', 'copyright', 'license', 'requires', 'suggests',
 		'screenshot', 'category', 'conflicts', 'provides',
-		'admin_interface', 'activate_on_install'
+		'activate_on_install'
 	);
 
 	/**
@@ -46,7 +46,6 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
 				case 'website':
 				case 'copyright':
 				case 'license':
-				case 'admin_interface':
 				case 'activate_on_install':
 					$parsed[$element->name] = $element->content;
 					break;
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index d12baed50..ae6429baf 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -230,8 +230,6 @@ function admin_init() {
 
 	elgg_register_action('admin/delete_admin_notice', '', 'admin');
 
-	elgg_register_action('admin/plugins/simple_update_states', '', 'admin');
-
 	elgg_register_action('profile/fields/reset', '', 'admin');
 	elgg_register_action('profile/fields/add', '', 'admin');
 	elgg_register_action('profile/fields/edit', '', 'admin');
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 72092b688..8f5f5dd1e 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -105,7 +105,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 				array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => 1.0),
 			),
 
-			'admin_interface' => 'simple',
 			'activate_on_install' => true
 		);
 
@@ -265,10 +264,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 		$this->assertEqual($this->manifest17->getConflicts(), array());
 	}
 
-	public function testElggPluginManifestGetAdminInterface() {
-		$this->assertEqual($this->manifest18->getAdminInterface(), 'simple');
-	}
-
 	public function testElggPluginManifestGetActivateOnInstall() {
 		$this->assertEqual($this->manifest18->getActivateOnInstall(), true);
 	}
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
index 23f0fa0bf..445a41c2e 100644
--- a/engine/tests/test_files/plugin_18/manifest.xml
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -34,7 +34,6 @@
 
 	<category>ServiceAPI</category>
 
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 
 	<requires>
diff --git a/languages/en.php b/languages/en.php
index 9967bc34d..67e447901 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -686,12 +686,7 @@ $english = array(
 	'admin:plugins:plugin_website' => 'Plugin website',
 	'admin:plugins:author' => '%s',
 	'admin:plugins:version' => 'Version %s',
-	'admin:plugins:simple' => 'Simple',
-	'admin:plugins:advanced' => 'Advanced',
 	'admin:plugin_settings' => 'Plugin Settings',
-	'admin:plugins:simple_simple_fail' => 'Could not save settings.',
-	'admin:plugins:simple_simple_success' => 'Settings saved.',
-	'admin:plugins:simple:cannot_activate' => 'Cannot activate this plugin. Check the advanced plugin admin area for more information.',
 	'admin:plugins:warning:unmet_dependencies_active' => 'This plugin is active but has unmet dependencies. You may encounter problems. See "more info" below for details.',
 
 	'admin:plugins:dependencies:type' => 'Type',
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index 991462060..dfbd7a1a6 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -15,6 +15,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 72e9af9b0..24969b837 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -16,5 +16,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 15d7192c1..db6f0324f 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -14,5 +14,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index 7bb2a2543..dd00f2c49 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -12,5 +12,4 @@
 		<type>elgg_version</type>
 		<version>2009030702</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
index b5e9cff2e..7096fc86a 100644
--- a/mod/dashboard/manifest.xml
+++ b/mod/dashboard/manifest.xml
@@ -12,5 +12,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index 4a7ed82bd..25840e164 100644
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -15,7 +15,4 @@
 		<type>elgg_version</type>
 		<version>2009030802</version>
 	</requires>
-
-	<admin_interface>advanced</admin_interface>
-
 </plugin_manifest>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index e85b19aef..5ebd7cf55 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -14,5 +14,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 02c012330..27e9b9ada 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -18,5 +18,4 @@
 		<name>file</name>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index 32528585d..4064ea602 100644
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -12,5 +12,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index aac9c3f6b..8a80e38dc 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -14,6 +14,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 466e49d61..0da71cd6b 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2009030702</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 4188aa861..542e9de01 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -15,5 +15,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index 0c48bbd28..b176834e5 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2009041701</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index e02c19c36..75a2d17f2 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -13,6 +13,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index f63c643a6..946cfd86b 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index 585288912..846ad155a 100644
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2009030702</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index ab6250ac0..503bf6cd1 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2009030702</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index b96684198..f5e95eb41 100644
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -13,5 +13,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 25c42ee93..5881c4e46 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index 66ca4b444..30acc240d 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index 16a67cb00..97b88fb75 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -12,6 +12,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index 4b5e5c747..a91881cab 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -14,6 +14,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index d811e373b..a1cff4dc2 100644
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -10,7 +10,6 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License Version 2</license>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 	<requires>
 		<type>elgg_version</type>
 		<version>2011010401</version>
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index c51134608..d65b55ca3 100644
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -13,5 +13,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index 053e22178..b13e127d0 100644
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -13,5 +13,4 @@
 		<version>2009030702</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 6fcad14e2..7c64829fc 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -13,5 +13,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 27dd5732d..74e811bed 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -13,6 +13,5 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 5e69055d8..2d062d399 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2010030101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index bd7176620..ffb6ccc05 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -13,5 +13,4 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index df0a7cb58..3358e1119 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -14,5 +14,4 @@
 		<version>2009033101</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index ecbff85fe..423a7e863 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -15,5 +15,4 @@
 		<version>2010111501</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
-- 
cgit v1.2.3


From f1be73852439f5eb7a9f6fdf1e9587f7b2346f69 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Sun, 23 Oct 2011 10:52:28 -0700
Subject: Fixes #3959. Using elgg_release in core plugins.

---
 mod/blog/manifest.xml                  | 4 ++--
 mod/bookmarks/manifest.xml             | 4 ++--
 mod/categories/manifest.xml            | 4 ++--
 mod/custom_index/manifest.xml          | 4 ++--
 mod/dashboard/manifest.xml             | 4 ++--
 mod/developers/manifest.xml            | 4 ++--
 mod/diagnostics/manifest.xml           | 4 ++--
 mod/embed/manifest.xml                 | 6 +++---
 mod/externalpages/manifest.xml         | 4 ++--
 mod/file/manifest.xml                  | 6 +++---
 mod/garbagecollector/manifest.xml      | 4 ++--
 mod/groups/manifest.xml                | 4 ++--
 mod/htmlawed/manifest.xml              | 4 ++--
 mod/invitefriends/manifest.xml         | 4 ++--
 mod/likes/manifest.xml                 | 4 ++--
 mod/logbrowser/manifest.xml            | 4 ++--
 mod/logrotate/manifest.xml             | 4 ++--
 mod/members/manifest.xml               | 4 ++--
 mod/messageboard/manifest.xml          | 4 ++--
 mod/messages/manifest.xml              | 4 ++--
 mod/notifications/manifest.xml         | 4 ++--
 mod/oauth_api/manifest.xml             | 4 ++--
 mod/pages/manifest.xml                 | 4 ++--
 mod/profile/manifest.xml               | 4 ++--
 mod/reportedcontent/manifest.xml       | 4 ++--
 mod/search/manifest.xml                | 4 ++--
 mod/tagcloud/manifest.xml              | 4 ++--
 mod/thewire/manifest.xml               | 4 ++--
 mod/tinymce/manifest.xml               | 4 ++--
 mod/twitter/manifest.xml               | 4 ++--
 mod/twitter_api/manifest.xml           | 4 ++--
 mod/uservalidationbyemail/manifest.xml | 4 ++--
 mod/zaudio/manifest.xml                | 4 ++--
 33 files changed, 68 insertions(+), 68 deletions(-)

(limited to 'mod/reportedcontent')

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index dfbd7a1a6..bd5f9c396 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -12,8 +12,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 24969b837..679d3f1d8 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -12,8 +12,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index db6f0324f..a2f4d97fc 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -11,7 +11,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index dd00f2c49..f93251214 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -9,7 +9,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
index 7096fc86a..14a620268 100644
--- a/mod/dashboard/manifest.xml
+++ b/mod/dashboard/manifest.xml
@@ -9,7 +9,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index 25840e164..6b672e231 100644
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -12,7 +12,7 @@
 	<license>GNU Public License version 2</license>
 
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030802</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index 5ebd7cf55..a9034d695 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -11,7 +11,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 27e9b9ada..c33c8b40a 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>Embed</name>
 	<author>Core developers</author>
-	<version>1.8</version>
+	<version>1.8.1</version>
 	<category>bundled</category>
 	<category>enhancement</category>
 	<description>Allows users to easily upload and embed media into text areas.</description>
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<requires>
 		<type>plugin</type>
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index 4064ea602..389ad6960 100644
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -9,7 +9,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 8a80e38dc..85ff76b41 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>File</name>
 	<author>Core developers</author>
-	<version>1.8</version>
+	<version>1.8.1</version>
 	<category>bundled</category>
 	<category>content</category>
 	<category>widget</category>
@@ -11,8 +11,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 0da71cd6b..1cbf33592 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 542e9de01..b8fd92de7 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -11,8 +11,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index b176834e5..aac599dee 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 3</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009041701</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 75a2d17f2..0a1ed2012 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index 946cfd86b..5a18b8862 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index 846ad155a..d3b76ee8c 100644
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 503bf6cd1..db04e762f 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index f5e95eb41..efd1ede5e 100644
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -9,8 +9,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 5881c4e46..b4f74c7d0 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index 30acc240d..238ccf42b 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -10,8 +10,8 @@
 	<website>http://www.elgg.org/</website>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index 97b88fb75..a07486331 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -9,8 +9,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index a0e3c4fda..62111e258 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010040201</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 
 	<conflicts>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index a91881cab..dfc521e11 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -11,8 +11,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index a1cff4dc2..f56604c7e 100644
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -11,7 +11,7 @@
 	<license>GNU Public License Version 2</license>
 	<activate_on_install>true</activate_on_install>
 	<requires>
-		<type>elgg_version</type>
-		<version>2011010401</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index d65b55ca3..aea8f8114 100644
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -9,8 +9,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index b13e127d0..9a952d3d8 100644
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -9,8 +9,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 7c64829fc..1127e9559 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -10,7 +10,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 74e811bed..9f6b0eaa9 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 2d062d399..ac7b23b29 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index ffb6ccc05..38380a2ba 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -10,7 +10,7 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 </plugin_manifest>
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 38b1dc9a7..51ad0dcb4 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010040201</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<requires>
 		<type>plugin</type>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 3358e1119..232ba71ca 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -10,8 +10,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009033101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 423a7e863..767637a56 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -11,8 +11,8 @@
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010111501</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
-- 
cgit v1.2.3


From 54773892f88f53231b85d08d86d11557121d9609 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 4 Nov 2011 22:40:06 -0400
Subject: Fixes #4059 page handlers all return nothing

---
 engine/lib/admin.php                |  9 ++--
 engine/lib/deprecated-1.8.php       | 37 +++++++++++++++
 engine/lib/elgglib.php              | 14 +++---
 engine/lib/pagehandler.php          | 64 +++-----------------------
 engine/lib/river.php                |  1 +
 engine/lib/tags.php                 | 27 +++++------
 engine/lib/user_settings.php        |  7 +--
 engine/lib/users.php                |  4 +-
 mod/blog/start.php                  | 12 ++---
 mod/bookmarks/start.php             |  6 +--
 mod/categories/start.php            |  5 +--
 mod/dashboard/start.php             |  4 ++
 mod/developers/start.php            |  1 +
 mod/diagnostics/start.php           |  3 --
 mod/externalpages/start.php         |  1 +
 mod/file/start.php                  | 11 +++--
 mod/groups/start.php                |  5 ++-
 mod/invitefriends/start.php         |  1 +
 mod/members/start.php               |  1 +
 mod/messageboard/start.php          |  4 +-
 mod/messages/start.php              |  6 +--
 mod/notifications/start.php         |  4 +-
 mod/pages/start.php                 |  4 +-
 mod/profile/start.php               |  1 +
 mod/reportedcontent/start.php       |  1 +
 mod/search/start.php                |  5 ++-
 mod/thewire/start.php               | 89 ++++++++++++++++++-------------------
 mod/twitter_api/start.php           |  9 ++--
 mod/uservalidationbyemail/start.php |  6 ++-
 29 files changed, 161 insertions(+), 181 deletions(-)

(limited to 'mod/reportedcontent')

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index ae6429baf..c0a5c0995 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -314,7 +314,7 @@ function admin_init() {
 	// automatic adding of widgets for admin
 	elgg_register_event_handler('make_admin', 'user', 'elgg_add_admin_widgets');
 
-	elgg_register_page_handler('admin', 'admin_settings_page_handler');
+	elgg_register_page_handler('admin', 'admin_page_handler');
 	elgg_register_page_handler('admin_plugin_screenshot', 'admin_plugin_screenshot_page_handler');
 	elgg_register_page_handler('admin_plugin_text_file', 'admin_markdown_page_handler');
 }
@@ -430,7 +430,7 @@ function admin_pagesetup() {
  * @return void
  * @access private
  */
-function admin_settings_page_handler($page) {
+function admin_page_handler($page) {
 
 	admin_gatekeeper();
 	elgg_admin_add_plugin_settings_menu();
@@ -485,7 +485,7 @@ function admin_settings_page_handler($page) {
  * admin_plugin_screenshot/<plugin_id>/<size>/<ss_name>.<ext>
  *
  * @param array $pages The pages array
- * @return true
+ * @return void
  * @access private
  */
 function admin_plugin_screenshot_page_handler($pages) {
@@ -524,8 +524,6 @@ function admin_plugin_screenshot_page_handler($pages) {
 			echo file_get_contents($file);
 			break;
 	}
-
-	return true;
 }
 
 /**
@@ -541,6 +539,7 @@ function admin_plugin_screenshot_page_handler($pages) {
  *	* LICENSE.txt
  *
  * @param type $page
+ * @return void
  * @access private
  */
 function admin_markdown_page_handler($pages) {
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index beba7d2b7..e1866498b 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -4735,3 +4735,40 @@ function remove_from_river_by_id($id) {
 
 	return elgg_delete_river(array('id' => $id));
 }
+
+/**
+ * A default page handler
+ * Tries to locate a suitable file to include. Only works for core pages, not plugins.
+ *
+ * @param array  $page    The page URL elements
+ * @param string $handler The base handler
+ *
+ * @return true|false Depending on success
+ * @deprecated 1.8
+ */
+function default_page_handler($page, $handler) {
+	global $CONFIG;
+
+	elgg_deprecated_notice("default_page_handler is deprecated", "1.8");
+
+	$page = implode('/', $page);
+
+	// protect against including arbitary files
+	$page = str_replace("..", "", $page);
+
+	$callpath = $CONFIG->path . $handler . "/" . $page;
+	if (is_dir($callpath)) {
+		$callpath = sanitise_filepath($callpath);
+		$callpath .= "index.php";
+		if (file_exists($callpath)) {
+			if (include($callpath)) {
+				return TRUE;
+			}
+		}
+	} else if (file_exists($callpath)) {
+		include($callpath);
+		return TRUE;
+	}
+
+	return FALSE;
+}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index a6f5fbc6f..03774deb4 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1745,7 +1745,7 @@ function _elgg_shutdown_hook() {
  * @access private
  */
 function elgg_js_page_handler($page) {
-	return elgg_cacheable_view_page_handler($page, 'js');
+	elgg_cacheable_view_page_handler($page, 'js');
 }
 
 /**
@@ -1777,8 +1777,6 @@ function elgg_ajax_page_handler($page) {
 
 		echo elgg_view($view, $vars);
 	}
-	
-	return true;
 }
 
 /**
@@ -1798,7 +1796,7 @@ function elgg_css_page_handler($page) {
 		$page[0] = 'elgg';
 	}
 	
-	return elgg_cacheable_view_page_handler($page, 'css');
+	elgg_cacheable_view_page_handler($page, 'css');
 }
 
 /**
@@ -1809,7 +1807,7 @@ function elgg_css_page_handler($page) {
  * @param array  $page The page array
  * @param string $type The type: js or css
  *
- * @return mixed
+ * @return void
  * @access private
  */
 function elgg_cacheable_view_page_handler($page, $type) {
@@ -1824,7 +1822,7 @@ function elgg_cacheable_view_page_handler($page, $type) {
 			break;
 
 		default:
-			return false;
+			return;
 			break;
 	}
 
@@ -1851,8 +1849,6 @@ function elgg_cacheable_view_page_handler($page, $type) {
 
 		echo $return;
 	}
-
-	return true;
 }
 
 /**
@@ -1886,6 +1882,8 @@ function elgg_sql_reverse_order_by_clause($order_by) {
  *
  * Used as a callback for ElggBatch.
  *
+ * @todo why aren't these static methods on ElggBatch?
+ *
  * @param object $object The object to enable
  * @return bool
  * @access private
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index 0d5e5f89b..91e568c1d 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -9,12 +9,10 @@
 /**
  * Turns the current page over to the page handler, allowing registered handlers to take over.
  *
- * If a page handler returns FALSE, the request is handed over to the default_page_handler.
- *
  * @param string $handler The name of the handler type (eg 'blog')
  * @param array  $page    The parameters to the page, as an array (exploded by '/' slashes)
  *
- * @return true|false Depending on whether a registered page handler was found
+ * @return bool
  * @access private
  */
 function page_handler($handler, $page) {
@@ -42,26 +40,12 @@ function page_handler($handler, $page) {
 	$handler = $params['handler'];
 	$page = $params['segments'];
 
-	if (!isset($CONFIG->pagehandler) || empty($handler)) {
-		$result = false;
-	} else if (isset($CONFIG->pagehandler[$handler]) && is_callable($CONFIG->pagehandler[$handler])) {
+	if (isset($CONFIG->pagehandler) && !empty($handler) && isset($CONFIG->pagehandler[$handler])) {
 		$function = $CONFIG->pagehandler[$handler];
-		$result = call_user_func($function, $page, $handler);
-		if ($result !== false) {
-			$result = true;
-		}
-	} else {
-		$result = false;
+		call_user_func($function, $page, $handler);
 	}
 
-	if (!$result) {
-		$result = default_page_handler($page, $handler);
-	}
-	if ($result !== false) {
-		$result = true;
-	}
-
-	return $result;
+	return headers_sent();
 }
 
 /**
@@ -74,14 +58,15 @@ function page_handler($handler, $page) {
  * For example, the URL http://yoururl/blog/username/friends/ would result in the call:
  * blog_page_handler(array('username','friends'), blog);
  *
- * Page handler functions should return true or the default page handler will be called.
- *
  * A request to register a page handler with the same identifier as previously registered
  * handler will replace the previous one.
  *
  * The context is set to the page handler identifier before the registered
  * page handler function is called. For the above example, the context is set to 'blog'.
  *
+ * Requests not handled are forwarded to the front page with a reason of 404.
+ * Plugins can register for the 'forward', '404' plugin hook. @see forward()
+ *
  * @param string $handler  The page type to handle
  * @param string $function Your function name
  *
@@ -119,38 +104,3 @@ function elgg_unregister_page_handler($handler) {
 
 	unset($CONFIG->pagehandler[$handler]);
 }
-
-/**
- * A default page handler
- * Tries to locate a suitable file to include. Only works for core pages, not plugins.
- *
- * @param array  $page    The page URL elements
- * @param string $handler The base handler
- *
- * @return true|false Depending on success
- * @access private
- */
-function default_page_handler($page, $handler) {
-	global $CONFIG;
-
-	$page = implode('/', $page);
-
-	// protect against including arbitary files
-	$page = str_replace("..", "", $page);
-
-	$callpath = $CONFIG->path . $handler . "/" . $page;
-	if (is_dir($callpath)) {
-		$callpath = sanitise_filepath($callpath);
-		$callpath .= "index.php";
-		if (file_exists($callpath)) {
-			if (include($callpath)) {
-				return TRUE;
-			}
-		}
-	} else if (file_exists($callpath)) {
-		include($callpath);
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/engine/lib/river.php b/engine/lib/river.php
index f430eb224..b2fead824 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -586,6 +586,7 @@ function update_river_access_by_object($object_guid, $access_id) {
  * Page handler for activiy
  *
  * @param array $page
+ * @return void
  * @access private
  */
 function elgg_river_page_handler($page) {
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index 6275d653c..b2c9a672f 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -325,21 +325,18 @@ function elgg_get_registered_tag_metadata_names() {
  * @access private
  */
 function elgg_tagcloud_page_handler($page) {
-	switch ($page[0]) {
-		default:
-			$title = elgg_view_title(elgg_echo('tags:site_cloud'));
-			$options = array(
-				'threshold' => 0,
-				'limit' => 100,
-				'tag_name' => 'tags',
-			);
-			$tags = elgg_view_tagcloud($options);
-			$content = $title . $tags;
-			$body = elgg_view_layout('one_sidebar', array('content' => $content));
-
-			echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
-			break;
-	}
+
+	$title = elgg_view_title(elgg_echo('tags:site_cloud'));
+	$options = array(
+		'threshold' => 0,
+		'limit' => 100,
+		'tag_name' => 'tags',
+	);
+	$tags = elgg_view_tagcloud($options);
+	$content = $title . $tags;
+	$body = elgg_view_layout('one_sidebar', array('content' => $content));
+
+	echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
 }
 
 /**
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index bb5d8d6c4..12084662b 100644
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -304,7 +304,7 @@ function usersettings_page_handler($page) {
 		$page[0] = 'user';
 	}
 
-	if ($page[1]) {
+	if (isset($page[1])) {
 		$user = get_user_by_username($page[1]);
 		elgg_set_page_owner_guid($user->guid);
 	} else {
@@ -324,12 +324,13 @@ function usersettings_page_handler($page) {
 			$path = $CONFIG->path . "pages/settings/tools.php";
 			break;
 		case 'user':
-		default:
 			$path = $CONFIG->path . "pages/settings/account.php";
 			break;
 	}
 
-	require($path);
+	if (isset($path)) {
+		require $path;
+	}
 }
 
 /**
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 843b897e9..3001a2ac6 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1072,7 +1072,7 @@ function friends_page_handler($page_elements) {
 function friends_of_page_handler($page_elements) {
 	elgg_set_context('friends');
 	if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) {
-		set_page_owner($user->getGUID());
+		elgg_set_page_owner_guid($user->getGUID());
 	}
 	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
 		collections_submenu_items();
@@ -1404,6 +1404,7 @@ function elgg_profile_fields_setup() {
  * /avatar/view/<username>/<size>/<icontime>
  *
  * @param array $page
+ * @return void
  * @access private
  */
 function elgg_avatar_page_handler($page) {
@@ -1426,6 +1427,7 @@ function elgg_avatar_page_handler($page) {
  * Profile page handler
  *
  * @param array $page
+ * @return void
  * @access private
  */
 function elgg_profile_page_handler($page) {
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 81837c48e..b2da00bc7 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -93,7 +93,7 @@ function blog_init() {
  * @todo no archives for all blogs or friends
  *
  * @param array $page
- * @return NULL
+ * @return void
  */
 function blog_page_handler($page) {
 
@@ -139,17 +139,17 @@ function blog_page_handler($page) {
 			$params = blog_get_page_content_list($page[1]);
 			break;
 		case 'all':
-		default:
-			$title = elgg_echo('blog:title:all_blogs');
 			$params = blog_get_page_content_list();
 			break;
 	}
 
-	$params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type));
+	if (isset($params)) {
+		$params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type));
 
-	$body = elgg_view_layout('content', $params);
+		$body = elgg_view_layout('content', $params);
 
-	echo elgg_view_page($params['title'], $body);
+		echo elgg_view_page($params['title'], $body);
+	}
 }
 
 /**
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 2a7b44e97..6d9dc9b3d 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -83,6 +83,7 @@ function bookmarks_init() {
  * Title is ignored
  *
  * @param array $page
+ * @return void
  */
 function bookmarks_page_handler($page) {
 	elgg_load_library('elgg:bookmarks');
@@ -145,14 +146,9 @@ function bookmarks_page_handler($page) {
 			set_input('container_guid', $page[1]);
 			include "$pages/bookmarklet.php";
 			break;
-
-		default:
-			return false;
 	}
 
 	elgg_pop_context();
-
-	return true;
 }
 
 /**
diff --git a/mod/categories/start.php b/mod/categories/start.php
index b6bc4a55c..3cec516f1 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -27,12 +27,11 @@ function categories_init() {
 
 
 /**
- * Page handler
- *
+ * Category page handler
+ * @return void
  */
 function categories_page_handler() {
 	include(dirname(__FILE__) . "/pages/categories/listing.php");
-	return TRUE;
 }
 
 /**
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
index 5635ead57..0197ee64f 100644
--- a/mod/dashboard/start.php
+++ b/mod/dashboard/start.php
@@ -29,6 +29,10 @@ function dashboard_init() {
 	elgg_register_plugin_hook_handler('get_list', 'default_widgets', 'dashboard_default_widgets');
 }
 
+/**
+ * Dashboard page handler
+ * @return void
+ */
 function dashboard_page_handler() {
 	// Ensure that only logged-in users can see this page
 	gatekeeper();
diff --git a/mod/developers/start.php b/mod/developers/start.php
index ab9a174a4..c89e3d36f 100644
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -157,6 +157,7 @@ function developers_log_events($name, $type) {
  * Serve the theme preview pages
  *
  * @param array $page
+ * @return void
  */
 function developers_theme_preview_controller($page) {
 	if (!isset($page[0])) {
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index 735e15042..0bcc08bd9 100644
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -12,9 +12,6 @@ elgg_register_event_handler('init', 'system', 'diagnostics_init');
  */
 function diagnostics_init() {
 
-	// Register a page handler, so we can have nice URLs
-	elgg_register_page_handler('diagnostics','diagnostics_page_handler');
-
 	// Add admin menu item
 	elgg_register_admin_menu_item('develop', 'diagnostics', 'develop_utilities');
 
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 3169503be..271051ba9 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -53,6 +53,7 @@ function expages_setup_footer_menu() {
  *
  * @param array  $page    URL segements
  * @param string $handler Handler identifier
+ * @return void
  */
 function expages_page_handler($page, $handler) {
 	if ($handler == 'expages') {
diff --git a/mod/file/start.php b/mod/file/start.php
index 9007fc9ba..bb20fc7ba 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -100,7 +100,7 @@ function file_init() {
  * Title is ignored
  *
  * @param array $page
- * @return NULL
+ * @return void
  */
 function file_page_handler($page) {
 
@@ -136,7 +136,6 @@ function file_page_handler($page) {
 			include "$file_dir/owner.php";
 			break;
 		case 'all':
-		default:
 			include "$file_dir/world.php";
 			break;
 	}
@@ -145,10 +144,10 @@ function file_page_handler($page) {
 /**
  * Creates the notification message body
  *
- * @param unknown_type $hook
- * @param unknown_type $entity_type
- * @param unknown_type $returnvalue
- * @param unknown_type $params
+ * @param string $hook
+ * @param string $entity_type
+ * @param string $returnvalue
+ * @param array  $params
  */
 function file_notify_message($hook, $entity_type, $returnvalue, $params) {
 	$entity = $params['entity'];
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 1b5b03ce7..710ccc0b2 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -192,6 +192,7 @@ function groups_setup_sidebar_menus() {
  *  Group members:        groups/members/<guid>
  *
  * @param array $page Array of url segments for routing
+ * @return void
  */
 function groups_page_handler($page) {
 
@@ -244,7 +245,8 @@ function groups_page_handler($page) {
 /**
  * Handle group icons.
  *
- * @param unknown_type $page
+ * @param array $page
+ * @return void
  */
 function groups_icon_handler($page) {
 
@@ -750,6 +752,7 @@ function discussion_init() {
  *  Edit discussion topic: discussion/edit/<guid>
  *
  * @param array $page Array of url segments for routing
+ * @return void
  */
 function discussion_page_handler($page) {
 
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index f39d25f4b..61cfed96c 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -27,6 +27,7 @@ function invitefriends_init() {
  * Page handler function
  * 
  * @param array $page Page URL segments
+ * @return void
  */
 function invitefriends_page_handler($page) {
 	gatekeeper();
diff --git a/mod/members/start.php b/mod/members/start.php
index 2c1793c17..1d734da17 100644
--- a/mod/members/start.php
+++ b/mod/members/start.php
@@ -19,6 +19,7 @@ function members_init() {
  * Members page handler
  *
  * @param array $page url segments
+ * @return void
  */
 function members_page_handler($page) {
 	$base = elgg_get_plugins_path() . 'members/pages/members';
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 0b0155069..9db16cf3b 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -42,7 +42,7 @@ function messageboard_init() {
  *  Group messageboard:                messageboard/group/<guid>/all (not implemented)
  *
  * @param array $page Array of page elements
- * @return bool
+ * @return void
  */
 function messageboard_page_handler($page) {
 	$new_section_one = array('owner', 'add', 'group');
@@ -85,8 +85,6 @@ function messageboard_page_handler($page) {
 			include "$pages/owner.php";
 			break;
 	}
-
-	return true;
 }
 
 /**
diff --git a/mod/messages/start.php b/mod/messages/start.php
index 4a3b0b250..631a5f731 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -70,7 +70,7 @@ function messages_init() {
  * Messages page handler
  *
  * @param array $page Array of URL components for routing
- * @return bool
+ * @return void
  */
 function messages_page_handler($page) {
 
@@ -112,11 +112,7 @@ function messages_page_handler($page) {
 		case 'add':
 			include("$base_dir/send.php");
 			break;
-		default:
-			return false;
 	}
-
-	return true;
 }
 
 /**
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index c6701cc3e..7ec82cfc9 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -36,6 +36,7 @@ function notifications_plugin_init() {
  * Route page requests
  *
  * @param array $page Array of url parameters
+ * @return void
  */
 function notifications_page_handler($page) {
 
@@ -51,12 +52,9 @@ function notifications_page_handler($page) {
 			require "$base/groups.php";
 			break;
 		case 'personal':
-		default:
 			require "$base/index.php";
 			break;
 	}
-
-	return TRUE;
 }
 
 /**
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 744306649..fd1d7df47 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -100,6 +100,7 @@ function pages_init() {
  * Title is ignored
  *
  * @param array $page
+ * @return void
  */
 function pages_page_handler($page) {
 
@@ -149,12 +150,9 @@ function pages_page_handler($page) {
 			include "$base_dir/revision.php";
 			break;
 		case 'all':
-		default:
 			include "$base_dir/world.php";
 			break;
 	}
-
-	return;
 }
 
 /**
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 0f13ad844..1c82d55f5 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -48,6 +48,7 @@ function profile_init() {
  * Profile page handler
  *
  * @param array $page Array of URL segments passed by the page handling mechanism
+ * @return void
  */
 function profile_page_handler($page) {
 
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index 66a1248d9..0638feb52 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -60,6 +60,7 @@ function reportedcontent_init() {
  * Serves the add report page
  *
  * @param array $page Array of page routing elements
+ * @return void
  */
 function reportedcontent_page_handler($page) {
 	// only logged in users can report things
diff --git a/mod/search/start.php b/mod/search/start.php
index 9ab14f42f..a88c6ec03 100644
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -14,7 +14,7 @@ function search_init() {
 	require_once 'search_hooks.php';
 
 	// page handler for search actions and results
-	elgg_register_page_handler('search','search_page_handler');
+	elgg_register_page_handler('search', 'search_page_handler');
 
 	// register some default search hooks
 	elgg_register_plugin_hook_handler('search', 'object', 'search_objects_hook');
@@ -55,7 +55,8 @@ function search_init() {
 /**
  * Page handler for search
  *
- * @param array $page Page elements from pain page handler
+ * @param array $page Page elements from core page handler
+ * @return void
  */
 function search_page_handler($page) {
 
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index d5e995359..f46d9ec75 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -84,58 +84,57 @@ function thewire_init() {
  * thewire/tag/<tag>            View wire posts tagged with <tag>
  *
  * @param array $page From the page_handler function
- * @return true|false Depending on success
+ * @return void
  */
 function thewire_page_handler($page) {
 
 	$base_dir = elgg_get_plugins_path() . 'thewire/pages/thewire';
 
-	// if just /thewire go to global view in the else statement
-	if (isset($page[0]) && $page[0]) {
-
-		switch ($page[0]) {
-			case "all":
-				include "$base_dir/everyone.php";
-				break;
-
-			case "friends":
-				include "$base_dir/friends.php";
-				break;
-
-			case "owner":
-				include "$base_dir/owner.php";
-				break;
-
-			case "thread":
-				if (isset($page[1])) {
-					set_input('thread_id', $page[1]);
-				}
-				include "$base_dir/thread.php";
-				break;
-			case "reply":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/reply.php";
-				break;
-			case "tag":
-				if (isset($page[1])) {
-					set_input('tag', $page[1]);
-				}
-				include "$base_dir/tag.php";
-				break;
-			case "previous":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/previous.php";
-				break;
-		}
-	} else {
-		include "$base_dir/everyone.php";
+	if (!isset($page[0])) {
+		$page = array('all');
 	}
 
-	return true;
+	switch ($page[0]) {
+		case "all":
+			include "$base_dir/everyone.php";
+			break;
+
+		case "friends":
+			include "$base_dir/friends.php";
+			break;
+
+		case "owner":
+			include "$base_dir/owner.php";
+			break;
+
+		case "thread":
+			if (isset($page[1])) {
+				set_input('thread_id', $page[1]);
+			}
+			include "$base_dir/thread.php";
+			break;
+
+		case "reply":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/reply.php";
+			break;
+
+		case "tag":
+			if (isset($page[1])) {
+				set_input('tag', $page[1]);
+			}
+			include "$base_dir/tag.php";
+			break;
+
+		case "previous":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/previous.php";
+			break;
+	}
 }
 
 /**
diff --git a/mod/twitter_api/start.php b/mod/twitter_api/start.php
index b17643c8c..fd2ff6493 100644
--- a/mod/twitter_api/start.php
+++ b/mod/twitter_api/start.php
@@ -45,13 +45,14 @@ function twitter_api_init() {
  * Handles old pg/twitterservice/ handler
  *
  * @param array $page
+ * @return void
  */
 function twitter_api_pagehandler_deprecated($page) {
 	$url = elgg_get_site_url() . 'pg/twitter_api/authorize';
 	$msg = elgg_echo('twitter_api:deprecated_callback_url', array($url));
 	register_error($msg);
 
-	return twitter_api_pagehandler($page);
+	twitter_api_pagehandler($page);
 }
 
 
@@ -59,10 +60,11 @@ function twitter_api_pagehandler_deprecated($page) {
  * Serves pages for twitter.
  *
  * @param array $page
+ * @return void
  */
 function twitter_api_pagehandler($page) {
 	if (!isset($page[0])) {
-		forward();
+		return;
 	}
 
 	switch ($page[0]) {
@@ -90,9 +92,6 @@ function twitter_api_pagehandler($page) {
 			$pages = dirname(__FILE__) . '/pages/twitter_api';
 			include "$pages/interstitial.php";
 			break;
-		default:
-			forward();
-			break;
 	}
 }
 
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index d3d0c3488..a674511cf 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -149,6 +149,7 @@ function uservalidationbyemail_check_auth_attempt($credentials) {
  * Checks sent passed validation code and user guids and validates the user.
  *
  * @param array $page
+ * @return void
  */
 function uservalidationbyemail_page_handler($page) {
 
@@ -162,7 +163,7 @@ function uservalidationbyemail_page_handler($page) {
 
 		$user = get_entity($user_guid);
 
-		if (($code) && ($user)) {
+		if ($code && $user) {
 			if (uservalidationbyemail_validate_email($user_guid, $code)) {
 
 				elgg_push_context('uservalidationbyemail_validate_user');
@@ -184,7 +185,8 @@ function uservalidationbyemail_page_handler($page) {
 		register_error(elgg_echo('email:confirm:fail'));
 	}
 
-	forward();
+	// forward to front page
+	forward('');
 }
 
 /**
-- 
cgit v1.2.3


From 0759c227bf7b73254cf6eb5e8502463875f2469f Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 4 Nov 2011 23:29:54 -0400
Subject: Fixes #4059 returning true when handling a page

---
 engine/lib/admin.php                |  9 ++++++---
 engine/lib/cron.php                 |  3 ++-
 engine/lib/elgglib.php              | 15 +++++++++------
 engine/lib/entities.php             |  4 +++-
 engine/lib/pagehandler.php          |  6 ++++--
 engine/lib/river.php                |  3 ++-
 engine/lib/tags.php                 |  3 ++-
 engine/lib/user_settings.php        |  3 ++-
 engine/lib/users.php                | 30 ++++++++++++++++++++++--------
 mod/blog/start.php                  | 13 +++++++------
 mod/bookmarks/start.php             |  6 +++++-
 mod/categories/start.php            |  3 ++-
 mod/dashboard/start.php             |  3 ++-
 mod/developers/start.php            |  3 ++-
 mod/externalpages/start.php         |  3 ++-
 mod/file/start.php                  |  5 ++++-
 mod/groups/start.php                | 10 ++++++++--
 mod/invitefriends/start.php         |  3 ++-
 mod/members/start.php               |  3 ++-
 mod/messageboard/start.php          |  6 +++++-
 mod/messages/start.php              |  5 ++++-
 mod/notifications/start.php         |  5 ++++-
 mod/pages/start.php                 |  5 ++++-
 mod/profile/start.php               |  3 ++-
 mod/reportedcontent/start.php       |  3 ++-
 mod/search/start.php                |  3 ++-
 mod/thewire/start.php               |  6 +++++-
 mod/twitter_api/start.php           |  9 ++++++---
 mod/uservalidationbyemail/start.php |  2 +-
 29 files changed, 123 insertions(+), 52 deletions(-)

(limited to 'mod/reportedcontent')

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index c0a5c0995..3baf2ff61 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -427,7 +427,7 @@ function admin_pagesetup() {
  *
  * @param array $page Array of pages
  *
- * @return void
+ * @return bool
  * @access private
  */
 function admin_page_handler($page) {
@@ -478,6 +478,7 @@ function admin_page_handler($page) {
 
 	$body = elgg_view_layout('admin', array('content' => $content, 'title' => $title));
 	echo elgg_view_page($title, $body, 'admin');
+	return true;
 }
 
 /**
@@ -485,7 +486,7 @@ function admin_page_handler($page) {
  * admin_plugin_screenshot/<plugin_id>/<size>/<ss_name>.<ext>
  *
  * @param array $pages The pages array
- * @return void
+ * @return bool
  * @access private
  */
 function admin_plugin_screenshot_page_handler($pages) {
@@ -524,6 +525,7 @@ function admin_plugin_screenshot_page_handler($pages) {
 			echo file_get_contents($file);
 			break;
 	}
+	return true;
 }
 
 /**
@@ -539,7 +541,7 @@ function admin_plugin_screenshot_page_handler($pages) {
  *	* LICENSE.txt
  *
  * @param type $page
- * @return void
+ * @return bool
  * @access private
  */
 function admin_markdown_page_handler($pages) {
@@ -595,6 +597,7 @@ function admin_markdown_page_handler($pages) {
 	));
 	
 	echo elgg_view_page($title, $body, 'admin');
+	return true;
 }
 
 /**
diff --git a/engine/lib/cron.php b/engine/lib/cron.php
index 8c0b62a53..8af640396 100644
--- a/engine/lib/cron.php
+++ b/engine/lib/cron.php
@@ -25,7 +25,7 @@ function cron_init() {
  *
  * @param array $page Pages
  *
- * @return void
+ * @return bool
  * @access private
  */
 function cron_page_handler($page) {
@@ -63,6 +63,7 @@ function cron_page_handler($page) {
 	$std_out = ob_get_clean();
 
 	echo $std_out . $old_stdout;
+	return true;
 }
 
 /**
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 03774deb4..10804fdca 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1740,12 +1740,12 @@ function _elgg_shutdown_hook() {
  *
  * @param array $page The page array
  *
- * @return void
+ * @return bool
  * @elgg_pagehandler js
  * @access private
  */
 function elgg_js_page_handler($page) {
-	elgg_cacheable_view_page_handler($page, 'js');
+	return elgg_cacheable_view_page_handler($page, 'js');
 }
 
 /**
@@ -1755,7 +1755,7 @@ function elgg_js_page_handler($page) {
  *
  * @param array $page The page array
  *
- * @return void
+ * @return bool
  * @elgg_pagehandler ajax
  * @access private
  */
@@ -1776,7 +1776,9 @@ function elgg_ajax_page_handler($page) {
 		}
 
 		echo elgg_view($view, $vars);
+		return true;
 	}
+	return false;
 }
 
 /**
@@ -1796,7 +1798,7 @@ function elgg_css_page_handler($page) {
 		$page[0] = 'elgg';
 	}
 	
-	elgg_cacheable_view_page_handler($page, 'css');
+	return elgg_cacheable_view_page_handler($page, 'css');
 }
 
 /**
@@ -1807,7 +1809,7 @@ function elgg_css_page_handler($page) {
  * @param array  $page The page array
  * @param string $type The type: js or css
  *
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_cacheable_view_page_handler($page, $type) {
@@ -1822,7 +1824,7 @@ function elgg_cacheable_view_page_handler($page, $type) {
 			break;
 
 		default:
-			return;
+			return false;
 			break;
 	}
 
@@ -1848,6 +1850,7 @@ function elgg_cacheable_view_page_handler($page, $type) {
 		//header("Content-Length: " . strlen($return));
 
 		echo $return;
+		return true;
 	}
 }
 
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 98e48641a..4b8b6694f 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2071,7 +2071,7 @@ function is_registered_entity_type($type, $subtype = null) {
  *
  * @param array $page Page elements from pain page handler
  *
- * @return void
+ * @return bool
  * @elgg_page_handler view
  * @access private
  */
@@ -2080,7 +2080,9 @@ function entities_page_handler($page) {
 		global $CONFIG;
 		set_input('guid', $page[0]);
 		include($CONFIG->path . "pages/entities/index.php");
+		return true;
 	}
+	return false;
 }
 
 /**
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index 91e568c1d..f331e2aae 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -40,12 +40,13 @@ function page_handler($handler, $page) {
 	$handler = $params['handler'];
 	$page = $params['segments'];
 
+	$result = false;
 	if (isset($CONFIG->pagehandler) && !empty($handler) && isset($CONFIG->pagehandler[$handler])) {
 		$function = $CONFIG->pagehandler[$handler];
-		call_user_func($function, $page, $handler);
+		$result = call_user_func($function, $page, $handler);
 	}
 
-	return headers_sent();
+	return $result || headers_sent();
 }
 
 /**
@@ -64,6 +65,7 @@ function page_handler($handler, $page) {
  * The context is set to the page handler identifier before the registered
  * page handler function is called. For the above example, the context is set to 'blog'.
  *
+ * Page handlers should return true to indicate that they handled the request.
  * Requests not handled are forwarded to the front page with a reason of 404.
  * Plugins can register for the 'forward', '404' plugin hook. @see forward()
  *
diff --git a/engine/lib/river.php b/engine/lib/river.php
index b2fead824..466eca253 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -586,7 +586,7 @@ function update_river_access_by_object($object_guid, $access_id) {
  * Page handler for activiy
  *
  * @param array $page
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_river_page_handler($page) {
@@ -607,6 +607,7 @@ function elgg_river_page_handler($page) {
 	$entity_subtype = '';
 
 	require_once("{$CONFIG->path}pages/river.php");
+	return true;
 }
 
 /**
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index b2c9a672f..a0887d0f3 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -321,7 +321,7 @@ function elgg_get_registered_tag_metadata_names() {
  *
  * @param array $page Page array
  *
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_tagcloud_page_handler($page) {
@@ -337,6 +337,7 @@ function elgg_tagcloud_page_handler($page) {
 	$body = elgg_view_layout('one_sidebar', array('content' => $content));
 
 	echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
+	return true;
 }
 
 /**
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index 12084662b..1e2d6db10 100644
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -294,7 +294,7 @@ function usersettings_pagesetup() {
  *
  * @param array $page Pages array
  *
- * @return void
+ * @return bool
  * @access private
  */
 function usersettings_page_handler($page) {
@@ -330,6 +330,7 @@ function usersettings_page_handler($page) {
 
 	if (isset($path)) {
 		require $path;
+		return true;
 	}
 }
 
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 3001a2ac6..3aff2ca9d 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1048,7 +1048,7 @@ function collections_submenu_items() {
  *
  * @param array $page_elements Page elements
  *
- * @return void
+ * @return bool
  * @access private
  */
 function friends_page_handler($page_elements) {
@@ -1059,6 +1059,7 @@ function friends_page_handler($page_elements) {
 		collections_submenu_items();
 	}
 	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php");
+	return true;
 }
 
 /**
@@ -1066,7 +1067,7 @@ function friends_page_handler($page_elements) {
  *
  * @param array $page_elements Page elements
  *
- * @return void
+ * @return bool
  * @access private
  */
 function friends_of_page_handler($page_elements) {
@@ -1078,6 +1079,7 @@ function friends_of_page_handler($page_elements) {
 		collections_submenu_items();
 	}
 	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php");
+	return true;
 }
 
 /**
@@ -1085,7 +1087,7 @@ function friends_of_page_handler($page_elements) {
  *
  * @param array $page_elements Page elements
  *
- * @return void
+ * @return bool
  * @access private
  */
 function collections_page_handler($page_elements) {
@@ -1096,6 +1098,7 @@ function collections_page_handler($page_elements) {
 			set_page_owner(elgg_get_logged_in_user_guid());
 			collections_submenu_items();
 			require_once "{$base}pages/friends/collections/add.php";
+			return true;
 		} else {
 			$user = get_user_by_username($page_elements[0]);
 			if ($user) {
@@ -1104,9 +1107,11 @@ function collections_page_handler($page_elements) {
 					collections_submenu_items();
 				}
 				require_once "{$base}pages/friends/collections/view.php";
+				return true;
 			}
 		}
 	}
+	return false;
 }
 
 /**
@@ -1115,7 +1120,7 @@ function collections_page_handler($page_elements) {
  * @param array  $page_elements Page elements
  * @param string $handler The handler string
  *
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_user_account_page_handler($page_elements, $handler) {
@@ -1131,7 +1136,10 @@ function elgg_user_account_page_handler($page_elements, $handler) {
 		case 'register':
 			require_once("$base_dir/register.php");
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
@@ -1140,17 +1148,18 @@ function elgg_user_account_page_handler($page_elements, $handler) {
  * This is a fallback for non-JS users who click on the
  * dropdown login link.
  *
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_user_login_page_handler() {
 	if (elgg_is_logged_in()) {
-		forward();
+		forward('');
 	}
 
 	$login_box = elgg_view('core/account/login_box');
 	$content = elgg_view_layout('one_column', array('content' => $login_box));
 	echo elgg_view_page(elgg_echo('login'), $content);
+	return true;
 }
 
 /**
@@ -1404,7 +1413,7 @@ function elgg_profile_fields_setup() {
  * /avatar/view/<username>/<size>/<icontime>
  *
  * @param array $page
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_avatar_page_handler($page) {
@@ -1417,17 +1426,20 @@ function elgg_avatar_page_handler($page) {
 
 	if ($page[0] == 'edit') {
 		require_once("{$CONFIG->path}pages/avatar/edit.php");
+		return true;
 	} else {
 		set_input('size', $page[2]);
 		require_once("{$CONFIG->path}pages/avatar/view.php");
+		return true;
 	}
+	return false;
 }
 
 /**
  * Profile page handler
  *
  * @param array $page
- * @return void
+ * @return bool
  * @access private
  */
 function elgg_profile_page_handler($page) {
@@ -1438,7 +1450,9 @@ function elgg_profile_page_handler($page) {
 
 	if ($page[1] == 'edit') {
 		require_once("{$CONFIG->path}pages/profile/edit.php");
+		return true;
 	}
+	return false;
 }
 
 /**
diff --git a/mod/blog/start.php b/mod/blog/start.php
index b2da00bc7..052c63651 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -93,7 +93,7 @@ function blog_init() {
  * @todo no archives for all blogs or friends
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function blog_page_handler($page) {
 
@@ -141,15 +141,16 @@ function blog_page_handler($page) {
 		case 'all':
 			$params = blog_get_page_content_list();
 			break;
+		default:
+			return false;
 	}
 
-	if (isset($params)) {
-		$params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type));
+	$params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type));
 
-		$body = elgg_view_layout('content', $params);
+	$body = elgg_view_layout('content', $params);
 
-		echo elgg_view_page($params['title'], $body);
-	}
+	echo elgg_view_page($params['title'], $body);
+	return true;
 }
 
 /**
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 6d9dc9b3d..21a2d8940 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -83,7 +83,7 @@ function bookmarks_init() {
  * Title is ignored
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function bookmarks_page_handler($page) {
 	elgg_load_library('elgg:bookmarks');
@@ -146,9 +146,13 @@ function bookmarks_page_handler($page) {
 			set_input('container_guid', $page[1]);
 			include "$pages/bookmarklet.php";
 			break;
+
+		default:
+			return false;
 	}
 
 	elgg_pop_context();
+	return true;
 }
 
 /**
diff --git a/mod/categories/start.php b/mod/categories/start.php
index 3cec516f1..0aacf11e7 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -28,10 +28,11 @@ function categories_init() {
 
 /**
  * Category page handler
- * @return void
+ * @return bool
  */
 function categories_page_handler() {
 	include(dirname(__FILE__) . "/pages/categories/listing.php");
+	return true;
 }
 
 /**
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
index 0197ee64f..65007d1a8 100644
--- a/mod/dashboard/start.php
+++ b/mod/dashboard/start.php
@@ -31,7 +31,7 @@ function dashboard_init() {
 
 /**
  * Dashboard page handler
- * @return void
+ * @return bool
  */
 function dashboard_page_handler() {
 	// Ensure that only logged-in users can see this page
@@ -55,6 +55,7 @@ function dashboard_page_handler() {
 	$body = elgg_view_layout('one_column', array('content' => $widgets));
 
 	echo elgg_view_page($title, $body);
+	return true;
 }
 
 
diff --git a/mod/developers/start.php b/mod/developers/start.php
index c89e3d36f..2e3df7663 100644
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -157,7 +157,7 @@ function developers_log_events($name, $type) {
  * Serve the theme preview pages
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function developers_theme_preview_controller($page) {
 	if (!isset($page[0])) {
@@ -192,4 +192,5 @@ function developers_theme_preview_controller($page) {
 	));
 	
 	echo elgg_view_page($title, $layout, 'theme_preview');
+	return true;
 }
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 271051ba9..13235af53 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -53,7 +53,7 @@ function expages_setup_footer_menu() {
  *
  * @param array  $page    URL segements
  * @param string $handler Handler identifier
- * @return void
+ * @return bool
  */
 function expages_page_handler($page, $handler) {
 	if ($handler == 'expages') {
@@ -77,6 +77,7 @@ function expages_page_handler($page, $handler) {
 
 	$body = elgg_view_layout("one_sidebar", array('content' => $content));
 	echo elgg_view_page($title, $body);
+	return true;
 }
 
 /**
diff --git a/mod/file/start.php b/mod/file/start.php
index bb20fc7ba..f8b7fa423 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -100,7 +100,7 @@ function file_init() {
  * Title is ignored
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function file_page_handler($page) {
 
@@ -138,7 +138,10 @@ function file_page_handler($page) {
 		case 'all':
 			include "$file_dir/world.php";
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 710ccc0b2..5469da013 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -192,7 +192,7 @@ function groups_setup_sidebar_menus() {
  *  Group members:        groups/members/<guid>
  *
  * @param array $page Array of url segments for routing
- * @return void
+ * @return bool
  */
 function groups_page_handler($page) {
 
@@ -239,7 +239,10 @@ function groups_page_handler($page) {
 		case 'requests':
 			groups_handle_requests_page($page[1]);
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
@@ -752,7 +755,7 @@ function discussion_init() {
  *  Edit discussion topic: discussion/edit/<guid>
  *
  * @param array $page Array of url segments for routing
- * @return void
+ * @return bool
  */
 function discussion_page_handler($page) {
 
@@ -776,7 +779,10 @@ function discussion_page_handler($page) {
 		case 'view':
 			discussion_handle_view_page($page[1]);
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index 61cfed96c..be853f2ce 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -27,7 +27,7 @@ function invitefriends_init() {
  * Page handler function
  * 
  * @param array $page Page URL segments
- * @return void
+ * @return bool
  */
 function invitefriends_page_handler($page) {
 	gatekeeper();
@@ -46,4 +46,5 @@ function invitefriends_page_handler($page) {
 	$body = elgg_view_layout('one_sidebar', $params);
 
 	echo elgg_view_page($title, $body);
+	return true;
 }
diff --git a/mod/members/start.php b/mod/members/start.php
index 1d734da17..54787cd16 100644
--- a/mod/members/start.php
+++ b/mod/members/start.php
@@ -19,7 +19,7 @@ function members_init() {
  * Members page handler
  *
  * @param array $page url segments
- * @return void
+ * @return bool
  */
 function members_page_handler($page) {
 	$base = elgg_get_plugins_path() . 'members/pages/members';
@@ -37,4 +37,5 @@ function members_page_handler($page) {
 	} else {
 		require_once "$base/index.php";
 	}
+	return true;
 }
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 9db16cf3b..0c65edc4f 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -42,7 +42,7 @@ function messageboard_init() {
  *  Group messageboard:                messageboard/group/<guid>/all (not implemented)
  *
  * @param array $page Array of page elements
- * @return void
+ * @return bool
  */
 function messageboard_page_handler($page) {
 	$new_section_one = array('owner', 'add', 'group');
@@ -84,7 +84,11 @@ function messageboard_page_handler($page) {
 			set_input('page_owner_guid', $owner_guid);
 			include "$pages/owner.php";
 			break;
+
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/messages/start.php b/mod/messages/start.php
index 631a5f731..e4ef4d43a 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -70,7 +70,7 @@ function messages_init() {
  * Messages page handler
  *
  * @param array $page Array of URL components for routing
- * @return void
+ * @return bool
  */
 function messages_page_handler($page) {
 
@@ -112,7 +112,10 @@ function messages_page_handler($page) {
 		case 'add':
 			include("$base_dir/send.php");
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 7ec82cfc9..761f17e40 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -36,7 +36,7 @@ function notifications_plugin_init() {
  * Route page requests
  *
  * @param array $page Array of url parameters
- * @return void
+ * @return bool
  */
 function notifications_page_handler($page) {
 
@@ -54,7 +54,10 @@ function notifications_page_handler($page) {
 		case 'personal':
 			require "$base/index.php";
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/pages/start.php b/mod/pages/start.php
index fd1d7df47..b2f26c719 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -100,7 +100,7 @@ function pages_init() {
  * Title is ignored
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function pages_page_handler($page) {
 
@@ -152,7 +152,10 @@ function pages_page_handler($page) {
 		case 'all':
 			include "$base_dir/world.php";
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 1c82d55f5..0ee2d0152 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -48,7 +48,7 @@ function profile_init() {
  * Profile page handler
  *
  * @param array $page Array of URL segments passed by the page handling mechanism
- * @return void
+ * @return bool
  */
 function profile_page_handler($page) {
 
@@ -85,6 +85,7 @@ function profile_page_handler($page) {
 
 	$body = elgg_view_layout('one_column', array('content' => $content));
 	echo elgg_view_page($title, $body);
+	return true;
 }
 
 /**
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index 0638feb52..8b18a4d64 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -60,7 +60,7 @@ function reportedcontent_init() {
  * Serves the add report page
  *
  * @param array $page Array of page routing elements
- * @return void
+ * @return bool
  */
 function reportedcontent_page_handler($page) {
 	// only logged in users can report things
@@ -77,6 +77,7 @@ function reportedcontent_page_handler($page) {
 	$body = elgg_view_layout('one_sidebar', $params);
 
 	echo elgg_view_page(elgg_echo('reportedcontent:this'), $body);
+	return true;
 }
 
 /**
diff --git a/mod/search/start.php b/mod/search/start.php
index a88c6ec03..73a96dc0a 100644
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -56,7 +56,7 @@ function search_init() {
  * Page handler for search
  *
  * @param array $page Page elements from core page handler
- * @return void
+ * @return bool
  */
 function search_page_handler($page) {
 
@@ -72,6 +72,7 @@ function search_page_handler($page) {
 	$base_dir = elgg_get_plugins_path() . 'search/pages/search';
 
 	include_once("$base_dir/index.php");
+	return true;
 }
 
 /**
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index f46d9ec75..2ed0f0b4d 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -84,7 +84,7 @@ function thewire_init() {
  * thewire/tag/<tag>            View wire posts tagged with <tag>
  *
  * @param array $page From the page_handler function
- * @return void
+ * @return bool
  */
 function thewire_page_handler($page) {
 
@@ -134,7 +134,11 @@ function thewire_page_handler($page) {
 			}
 			include "$base_dir/previous.php";
 			break;
+
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/twitter_api/start.php b/mod/twitter_api/start.php
index fd2ff6493..08bce5479 100644
--- a/mod/twitter_api/start.php
+++ b/mod/twitter_api/start.php
@@ -45,14 +45,14 @@ function twitter_api_init() {
  * Handles old pg/twitterservice/ handler
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function twitter_api_pagehandler_deprecated($page) {
 	$url = elgg_get_site_url() . 'pg/twitter_api/authorize';
 	$msg = elgg_echo('twitter_api:deprecated_callback_url', array($url));
 	register_error($msg);
 
-	twitter_api_pagehandler($page);
+	return twitter_api_pagehandler($page);
 }
 
 
@@ -64,7 +64,7 @@ function twitter_api_pagehandler_deprecated($page) {
  */
 function twitter_api_pagehandler($page) {
 	if (!isset($page[0])) {
-		return;
+		return false;
 	}
 
 	switch ($page[0]) {
@@ -92,7 +92,10 @@ function twitter_api_pagehandler($page) {
 			$pages = dirname(__FILE__) . '/pages/twitter_api';
 			include "$pages/interstitial.php";
 			break;
+		default:
+			return false;
 	}
+	return true;
 }
 
 /**
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index a674511cf..6904ce9e2 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -149,7 +149,7 @@ function uservalidationbyemail_check_auth_attempt($credentials) {
  * Checks sent passed validation code and user guids and validates the user.
  *
  * @param array $page
- * @return void
+ * @return bool
  */
 function uservalidationbyemail_page_handler($page) {
 
-- 
cgit v1.2.3


From 77b53f716a9043b89a7ad128eec34c910006fe24 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 8 Nov 2011 06:45:18 -0500
Subject: it is GPL General Public License not GPL Public License

---
 .../examples/plugins/manifest_options/manifest.xml       |  4 ++--
 documentation/examples/plugins/skeleton/manifest.xml     |  2 +-
 engine/tests/api/plugins.php                             | 16 ++++++++--------
 engine/tests/test_files/plugin_17/manifest.xml           |  4 ++--
 engine/tests/test_files/plugin_18/manifest.xml           |  4 ++--
 mod/blog/manifest.xml                                    |  2 +-
 mod/bookmarks/manifest.xml                               |  2 +-
 mod/categories/manifest.xml                              |  2 +-
 mod/custom_index/manifest.xml                            |  2 +-
 mod/dashboard/manifest.xml                               |  2 +-
 mod/developers/manifest.xml                              |  2 +-
 mod/diagnostics/manifest.xml                             |  2 +-
 mod/embed/manifest.xml                                   |  2 +-
 mod/externalpages/manifest.xml                           |  2 +-
 mod/file/manifest.xml                                    |  2 +-
 mod/garbagecollector/manifest.xml                        |  2 +-
 mod/groups/manifest.xml                                  |  2 +-
 mod/htmlawed/manifest.xml                                |  2 +-
 mod/invitefriends/manifest.xml                           |  2 +-
 mod/likes/manifest.xml                                   |  2 +-
 mod/logbrowser/manifest.xml                              |  2 +-
 mod/logrotate/manifest.xml                               |  2 +-
 mod/members/manifest.xml                                 |  2 +-
 mod/messageboard/manifest.xml                            |  2 +-
 mod/messages/manifest.xml                                |  2 +-
 mod/notifications/manifest.xml                           |  2 +-
 mod/oauth_api/manifest.xml                               |  2 +-
 mod/pages/manifest.xml                                   |  2 +-
 mod/profile/manifest.xml                                 |  2 +-
 mod/reportedcontent/manifest.xml                         |  2 +-
 mod/search/manifest.xml                                  |  2 +-
 mod/tagcloud/manifest.xml                                |  2 +-
 mod/thewire/manifest.xml                                 |  2 +-
 mod/tinymce/manifest.xml                                 |  2 +-
 mod/twitter/manifest.xml                                 |  2 +-
 mod/twitter_api/manifest.xml                             |  2 +-
 mod/uservalidationbyemail/manifest.xml                   |  2 +-
 mod/zaudio/manifest.xml                                  |  2 +-
 38 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'mod/reportedcontent')

diff --git a/documentation/examples/plugins/manifest_options/manifest.xml b/documentation/examples/plugins/manifest_options/manifest.xml
index 48a5a9558..baa6cc3fa 100644
--- a/documentation/examples/plugins/manifest_options/manifest.xml
+++ b/documentation/examples/plugins/manifest_options/manifest.xml
@@ -6,8 +6,8 @@
 	<blurb>A concise description.</blurb>
 	<description>This is a longer, more interesting description of my plugin, its features, and other important information.</description>
 	<website>http://www.elgg.org/</website>
-	<copyright>(C) Elgg 2010</copyright>
-	<license>GNU Public License version 2</license>
+	<copyright>(C) Elgg 2011</copyright>
+	<license>GNU General Public License version 2</license>
 
 	<requires>
 		<type>elgg_version</type>
diff --git a/documentation/examples/plugins/skeleton/manifest.xml b/documentation/examples/plugins/skeleton/manifest.xml
index febe71999..e31624432 100644
--- a/documentation/examples/plugins/skeleton/manifest.xml
+++ b/documentation/examples/plugins/skeleton/manifest.xml
@@ -6,7 +6,7 @@
 	<description>This is a description of my plugin and its features.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>(C) My Name or Company 2012</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 
 	<requires>
 		<type>elgg_release</type>
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 8f5f5dd1e..a0faaff0e 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -68,8 +68,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 			'blurb' => 'A concise description.',
 			'description' => 'A longer, more interesting description.',
 			'website' => 'http://www.elgg.org/',
-			'copyright' => '(C) Elgg 2010',
-			'license' => 'GNU Public License version 2',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
 
 			'requires' => array(
 				array('type' => 'elgg_version', 'version' => '3009030802', 'comparison' => 'lt'),
@@ -117,8 +117,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 			'version' => '1.0',
 			'description' => 'A 1.7-style manifest.',
 			'website' => 'http://www.elgg.org/',
-			'copyright' => '(C) Elgg 2010',
-			'license' => 'GNU Public License version 2',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
 			'elgg_version' => '2009030702',
 			'name' => 'Plugin Test 17',
 		);
@@ -165,13 +165,13 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 	}
 
 	public function testElggPluginManifestGetCopyright() {
-		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
-		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
 	}
 
 	public function testElggPluginManifestGetLicense() {
-		$this->assertEqual($this->manifest18->getLicense(), 'GNU Public License version 2');
-		$this->assertEqual($this->manifest17->getLicense(), 'GNU Public License version 2');
+		$this->assertEqual($this->manifest18->getLicense(), 'GNU General Public License version 2');
+		$this->assertEqual($this->manifest17->getLicense(), 'GNU General Public License version 2');
 	}
 
 
diff --git a/engine/tests/test_files/plugin_17/manifest.xml b/engine/tests/test_files/plugin_17/manifest.xml
index bb178ab93..706734265 100644
--- a/engine/tests/test_files/plugin_17/manifest.xml
+++ b/engine/tests/test_files/plugin_17/manifest.xml
@@ -4,7 +4,7 @@
 	<field key="version" value="1.0" />
 	<field key="description" value="A 1.7-style manifest." />
 	<field key="website" value="http://www.elgg.org/" />
-	<field key="copyright" value="(C) Elgg 2010" />
-	<field key="license" value="GNU Public License version 2" />
+	<field key="copyright" value="(C) Elgg Foundation 2011" />
+	<field key="license" value="GNU General Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
 </plugin_manifest>
\ No newline at end of file
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
index 445a41c2e..e0776ffc1 100644
--- a/engine/tests/test_files/plugin_18/manifest.xml
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -6,8 +6,8 @@
 	<blurb>A concise description.</blurb>
 	<description>A longer, more interesting description.</description>
 	<website>http://www.elgg.org/</website>
-	<copyright>(C) Elgg 2010</copyright>
-	<license>GNU Public License version 2</license>
+	<copyright>(C) Elgg Foundation 2011</copyright>
+	<license>GNU General Public License version 2</license>
 
 	<requires>
 		<type>elgg_version</type>
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index bd5f9c396..29ee1bfc8 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -10,7 +10,7 @@
 	<description>Adds simple blogging capabilities to your Elgg installation.</description>
 	<website>http://elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 679d3f1d8..b95af87f8 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -10,7 +10,7 @@
 	<description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index a2f4d97fc..4a6bd0864 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index f93251214..80187efbc 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -7,7 +7,7 @@
 	<description>A demonstration of how to create a front page plugin.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
index 14a620268..cbbc1044c 100644
--- a/mod/dashboard/manifest.xml
+++ b/mod/dashboard/manifest.xml
@@ -7,7 +7,7 @@
 	<description>A widget-based dashboard for your users</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index 6b672e231..93a12945d 100644
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -9,7 +9,7 @@
 	<description>A set of tools for writing plugins and themes. It is recommended that you have this plugin at the top of the plugin list.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 
 	<requires>
 		<type>elgg_release</type>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index a9034d695..21e847d22 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Elgg diagnostics tool</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index c33c8b40a..7ffbc23a4 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Allows users to easily upload and embed media into text areas.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index 389ad6960..f2aef09f3 100644
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -7,7 +7,7 @@
 	<description>Create simple web pages for about, contact, privacy, and terms.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 85ff76b41..26282a8e3 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -9,7 +9,7 @@
 	<description>File browser plugin</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 1cbf33592..5aafebf38 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Perform some database cleanup tasks</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index b8fd92de7..fd28360d0 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Provides group support for elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index aac599dee..5c1f14cb5 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Provides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 3</license>
+	<license>GNU General Public License version 3</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 0a1ed2012..b36238a05 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Invite friends via email invites.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index 5a18b8862..62835fcf5 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Enables users to like content on the site.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index d3b76ee8c..4527e2cbb 100644
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Browse the system event log</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index db04e762f..1aa62e2e7 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Rotate the system log at specific intervals</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index efd1ede5e..8b18c9f91 100644
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -7,7 +7,7 @@
 	<description>Lists the members of your site</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index b4f74c7d0..617813725 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -8,7 +8,7 @@
 	<description>This plugin allows users to put a message board on their profile for other users to post comments.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index 238ccf42b..73a58d9d4 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Elgg internal messages plugin. This plugin lets user send each other messages.</description>
 	<copyright>See COPYRIGHT.txt</copyright>
 	<website>http://www.elgg.org/</website>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index a07486331..205476881 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -7,7 +7,7 @@
 	<description>Elgg notifications plugin</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 62111e258..efd3d944f 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -8,7 +8,7 @@
 	<category>api</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index dfc521e11..6990bd6b0 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Elgg Pages</description>
 	<website>http://www.elgg.org</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index f56604c7e..86fbc7b7b 100644
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -8,7 +8,7 @@
 	<category>social</category>
 	<website>http://elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License Version 2</license>
+	<license>GNU General Public License Version 2</license>
 	<activate_on_install>true</activate_on_install>
 	<requires>
 		<type>elgg_release</type>
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index aea8f8114..e96620b01 100644
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -7,7 +7,7 @@
 	<description>Adds the option for users to report content and for admins to check it out.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index 9a952d3d8..513d3a6b9 100644
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -7,7 +7,7 @@
 	<description>Allow search across entities of the site</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 1127e9559..c0f89f35e 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Widget-based tag clouds.</description>
 	<website>http://cashcostello.com/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 9f6b0eaa9..962ed12f1 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Microblogging for Elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index ac7b23b29..61bf0c22c 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -8,7 +8,7 @@
 	<description>TinyMCE plugin.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index 38380a2ba..18fa8c957 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Elgg simple twitter widget</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 51ad0dcb4..86bba4b50 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -8,7 +8,7 @@
 	<category>bundled</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 232ba71ca..800dd2641 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Simple user account validation via email.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 767637a56..54f819658 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -9,7 +9,7 @@
 	<description>This simple plugin lets users play mp3's in the page.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
-- 
cgit v1.2.3