From 6d47049d72562d74f0c6838fc2d9d3d89c016a47 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 20:08:16 +0000
Subject: Refs #3236 updated the button css so that disable plugin button looks
 like a button

git-svn-id: http://code.elgg.org/elgg/trunk@9047 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 5fbf50142..42712cadf 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -650,7 +650,7 @@ $english = array(
 	'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
 	'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
 	'admin:plugins:warning:invalid' => '%s is not a valid Elgg plugin.  Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
-	'admin:plugins:cannot_activate' => 'Cannot Activate',
+	'admin:plugins:cannot_activate' => 'cannot activate',
 
 	'admin:plugins:set_priority:yes' => "Reordered %s.",
 	'admin:plugins:set_priority:no' => "Could not reorder %s.",
-- 
cgit v1.2.3


From 4c4fa09266340488dac8ec1624aa233c89aadf68 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 20:33:56 +0000
Subject: Trying to increase probability that people will read the welcome
 widget by making the text shorter

git-svn-id: http://code.elgg.org/elgg/trunk@9048 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                                | 28 +++++++------------------
 views/default/widgets/admin_welcome/content.php |  5 -----
 2 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 42712cadf..943dbb285 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -573,32 +573,20 @@ $english = array(
 	'admin:widget:admin_welcome' => 'Welcome',
 	'admin:widget:admin_welcome:help' => "A short introduction to Elgg's admin area",
 	'admin:widget:admin_welcome:intro' =>
-'Welcome to Elgg!  This widget is a quick overview of setting up and maintaining your new Elgg site.',
+'Welcome to Elgg! Right now you are looking at the administration dashboard. It\'s useful for tracking what\'s happening on the site.',
 
 	'admin:widget:admin_welcome:admin_overview' =>
-'This page is the Admin Dashboard and provides a quick overview of your system. '
-. "You can <a class=\"elgg-toggler\" href=\"#widgets-add-panel\">add</a>"
-. " and rearrange widgets to show the information you care about.  The menu to the right is oranganized into"
-. " three areas:
+"Navigation for the administration area is provide by the menu to the right. It is organized into"
+. " three sections:
 	<ul>
-		<li>Administer - Everyday tasks like monitoring reported content, checking online users, and viewing logs.</li>
-		<li>Configure - Configuration settings likes the site name, the active plugins, and plugin settings.</li>
-		<li>Develop - If developer settings are enabled, shows options for developers like a theme preview and event explorer.</li>
+		<li><b>Administer</b> - Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</li>
+		<li><b>Configure</b> - Occasional tasks like setting the site name or activating a plugin.</li>
+		<li><b>Develop</b> - For developers who are building plugins or designing themes. (Requires a developer plugin.)</li>
 	</ul>
 	",
 
-	'admin:widget:admin_welcome:common_links' =>
-'The first section you should visit is the <a href="%s">Plugins page</a> to activate or deactivate site features.'
-. ' If you\'re not quite ready to have users on your site, think about disabling registration and'
-. ' restricting content to logged in users on the <a href="%s">Advanced Site Settings page</a>.',
-
-	'admin:widget:admin_welcome:external_resources' =>
-"There are many resources available for help with your network.  Check the links in the footer for"
-. " <a href=\"http://docs.elgg.org/wiki/Category:Administration_FAQ\">FAQs</a>, <a href=\"http://docs.elgg.org/wiki/Administration_Manual\">"
-. "manuals</a>, <a href=\"http://blog.elgg.org/\">Elgg news</a>, and <a href=\"http://community.elgg.org/pg/groups/world/\">support forums</a>"
-. " at the <a href=\"http://community.elgg.org/\">Elgg Community</a>.",
-
-	'admin:widget:admin_welcome:outro' => 'Thank you for using Elgg!',
+	// argh, this is ugly
+	'admin:widget:admin_welcome:outro' => '<br />Be sure to check out the resources available through the footer links and thank you for using Elgg!',
 
 	'admin:footer:faq' => 'Administration FAQ',
 	'admin:footer:manual' => 'Administration Manual',
diff --git a/views/default/widgets/admin_welcome/content.php b/views/default/widgets/admin_welcome/content.php
index 4ebdb719c..6a9a92e27 100644
--- a/views/default/widgets/admin_welcome/content.php
+++ b/views/default/widgets/admin_welcome/content.php
@@ -7,11 +7,6 @@
 $sections = array(
 	'intro' => array(),
 	'admin_overview' => array(),
-	'common_links' => array(
-			elgg_normalize_url('pg/admin/plugins/simple'),
-			elgg_normalize_url('pg/admin/site/advanced'),
-	),
-	'external_resources' => array(),
 	'outro' => array()
 );
 
-- 
cgit v1.2.3


From 099d20345018ac424cc7d89b7111fba0c94d79f3 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 29 Apr 2011 22:44:41 +0000
Subject: Made admin welcome widget a bit more semantic

git-svn-id: http://code.elgg.org/elgg/trunk@9055 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                                | 10 +++++-----
 views/default/css/admin.php                     |  3 +++
 views/default/widgets/admin_welcome/content.php |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 943dbb285..1e32caf6f 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -578,11 +578,11 @@ $english = array(
 	'admin:widget:admin_welcome:admin_overview' =>
 "Navigation for the administration area is provide by the menu to the right. It is organized into"
 . " three sections:
-	<ul>
-		<li><b>Administer</b> - Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</li>
-		<li><b>Configure</b> - Occasional tasks like setting the site name or activating a plugin.</li>
-		<li><b>Develop</b> - For developers who are building plugins or designing themes. (Requires a developer plugin.)</li>
-	</ul>
+	<dl>
+		<dt>Administer</dt><dd>Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</dd>
+		<dt>Configure</dt><dd>Occasional tasks like setting the site name or activating a plugin.</dd>
+		<dt>Develop</dt><dd>For developers who are building plugins or designing themes. (Requires a developer plugin.)</dd>
+	</dl>
 	",
 
 	// argh, this is ugly
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 68720b89a..3801fee32 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -116,6 +116,9 @@ p {
 	margin-bottom: 15px;
 }
 
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 2em }
+
 table.mceLayout {
 	width:100% !important;
 }
diff --git a/views/default/widgets/admin_welcome/content.php b/views/default/widgets/admin_welcome/content.php
index 6a9a92e27..f4b92ea66 100644
--- a/views/default/widgets/admin_welcome/content.php
+++ b/views/default/widgets/admin_welcome/content.php
@@ -12,6 +12,8 @@ $sections = array(
 
 // don't use longtext because it filters output.
 // that's annoying.
+echo '<div class="elgg-output">';
 foreach ($sections as $section => $strings) {
 	echo '<p>' . elgg_echo("admin:widget:admin_welcome:$section", $strings) . '</p>';
-}
\ No newline at end of file
+}
+echo '</div>';
\ No newline at end of file
-- 
cgit v1.2.3


From 195e5060fe480717471826cbe1f2ed094109d837 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 14 May 2011 17:12:55 +0000
Subject: Refs #2104 more category work for bundled plugins

git-svn-id: http://code.elgg.org/elgg/trunk@9068 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php             | 5 ++++-
 mod/groups/manifest.xml      | 1 +
 mod/likes/manifest.xml       | 1 +
 mod/oauth_api/manifest.xml   | 3 ++-
 mod/twitter_api/manifest.xml | 2 +-
 mod/zaudio/manifest.xml      | 1 +
 6 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 1e32caf6f..276d113a7 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -599,7 +599,10 @@ $english = array(
 	'admin:plugins:category:content' => 'Content',
 	'admin:plugins:category:development' => 'Development',
 	'admin:plugins:category:extension' => 'Extensions',
-	'admin:plugins:category:service' => 'Service/API',
+	'admin:plugins:category:api' => 'Service/API',
+	'admin:plugins:category:communication' => 'Communication',
+	'admin:plugins:category:social' => 'Social',
+	'admin:plugins:category:multimedia' => 'Multimedia',
 
 	'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
 	'admin:plugins:markdown:unknown_file' => 'Unknown file.',
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 32671397d..c67a5307f 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
 	<description>Provides group support for elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index abd3f7c76..f63c643a6 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
 	<description>Enables users to like content on the site.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 121c2e774..a0e3c4fda 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -3,8 +3,9 @@
 	<name>OAuth API</name>
 	<author>Core developers</author>
 	<version>1.8</version>
-	<category>bundled</category>
 	<description>Provides OAuth libraries and API support.</description>
+	<category>bundled</category>
+	<category>api</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 51306c98e..38b1dc9a7 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -4,7 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<description>Allows users to authenticate their Elgg account with Twitter.</description>
-	<category>service</category>
+	<category>api</category>
 	<category>bundled</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 0384df743..3b2dc47e8 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>extension</category>
+	<category>multimedia</category>
 	<description>This simple plugin lets users play mp3's in the page.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-- 
cgit v1.2.3


From f21d7deb6168f4d1beecee02dd1197fc9a2d1d45 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 14 May 2011 17:44:32 +0000
Subject: fixed typo in the admin welcome widget

git-svn-id: http://code.elgg.org/elgg/trunk@9070 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 276d113a7..ec39f64a9 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -576,7 +576,7 @@ $english = array(
 'Welcome to Elgg! Right now you are looking at the administration dashboard. It\'s useful for tracking what\'s happening on the site.',
 
 	'admin:widget:admin_welcome:admin_overview' =>
-"Navigation for the administration area is provide by the menu to the right. It is organized into"
+"Navigation for the administration area is provided by the menu to the right. It is organized into"
 . " three sections:
 	<dl>
 		<dt>Administer</dt><dd>Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</dd>
-- 
cgit v1.2.3


From 81d6884ecad771f4b4f2d8be7572d1a89deaab10 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 19 May 2011 11:21:53 +0000
Subject: Fixes #3462 empty classes directory is no longer treated as an error

git-svn-id: http://code.elgg.org/elgg/trunk@9100 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggPlugin.php | 7 +------
 engine/lib/elgglib.php        | 8 +-------
 languages/en.php              | 1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'languages/en.php')

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index eb911455a..95a7362e2 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -839,12 +839,7 @@ class ElggPlugin extends ElggObject {
 			return true;
 		}
 
-		// but need to have working ones.
-		if (!elgg_register_classes($classes_path)) {
-			$msg = elgg_echo('ElggPlugin:Exception:CannotRegisterClasses',
-							array($this->getID(), $this->guid, $classes_path));
-			throw new PluginException($msg);
-		}
+		elgg_register_classes($classes_path);
 
 		return true;
 	}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e67f8b627..170750849 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -33,21 +33,15 @@ function _elgg_autoload($class) {
  *
  * @param string $dir The dir to look in
  *
- * @return true
+ * @return void
  * @since 1.8.0
  */
 function elgg_register_classes($dir) {
 	$classes = elgg_get_file_list($dir, array(), array(), array('.php'));
 
-	if (!$classes) {
-		return false;
-	}
-
 	foreach ($classes as $class) {
 		elgg_register_class(basename($class, '.php'), $class);
 	}
-
-	return true;
 }
 
 /**
diff --git a/languages/en.php b/languages/en.php
index ec39f64a9..768658c99 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -81,7 +81,6 @@ $english = array(
 	'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:CannotRegisterLanguages' => 'Cannot register languages for plugin %s (guid: %s) at %s.  Check permissions!',
-	'ElggPlugin:Exception:CannotRegisterClasses' => 'Cannot register classes for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:NoID' => 'No ID for plugin guid %s!',
 
 	'PluginException:ParserError' => 'Error parsing manifest with API version %s in plugin %s.',
-- 
cgit v1.2.3


From 6edf852e9c5e352e02140ba9f2ab93b3a8750172 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 20 May 2011 01:08:10 +0000
Subject: Refs #2104 changed extension to enhancement and added security,
 widget, and theme categories

git-svn-id: http://code.elgg.org/elgg/trunk@9105 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                       | 5 ++++-
 mod/blog/manifest.xml                  | 1 +
 mod/bookmarks/manifest.xml             | 1 +
 mod/categories/manifest.xml            | 1 +
 mod/diagnostics/manifest.xml           | 2 ++
 mod/embed/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/logrotate/manifest.xml             | 1 +
 mod/messageboard/manifest.xml          | 1 +
 mod/pages/manifest.xml                 | 1 +
 mod/tagcloud/manifest.xml              | 1 +
 mod/tinymce/manifest.xml               | 2 +-
 mod/twitter/manifest.xml               | 1 +
 mod/uservalidationbyemail/manifest.xml | 1 +
 mod/zaudio/manifest.xml                | 2 +-
 19 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 768658c99..509de7fb0 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -597,11 +597,14 @@ $english = array(
 	'admin:plugins:category:bundled' => 'Bundled',
 	'admin:plugins:category:content' => 'Content',
 	'admin:plugins:category:development' => 'Development',
-	'admin:plugins:category:extension' => 'Extensions',
+	'admin:plugins:category:enhancement' => 'Enhancements',
 	'admin:plugins:category:api' => 'Service/API',
 	'admin:plugins:category:communication' => 'Communication',
+	'admin:plugins:category:security' => 'Security and Spam',
 	'admin:plugins:category:social' => 'Social',
 	'admin:plugins:category:multimedia' => 'Multimedia',
+	'admin:plugins:category:theme' => 'Themes',
+	'admin:plugins:category:widget' => 'Widgets',
 
 	'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
 	'admin:plugins:markdown:unknown_file' => 'Unknown file.',
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index f0ec96e8b..991462060 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<blurb>Blog plugin</blurb>
 	<description>Adds simple blogging capabilities to your Elgg installation.</description>
 	<website>http://elgg.org/</website>
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 88921dcce..72e9af9b0 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<blurb>Add and comment on bookmarks.</blurb>
 	<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>
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 43df13d02..15d7192c1 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>enhancement</category>
 	<blurb>Add site-wide categories</blurb>
 	<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
 	<website>http://www.elgg.org/</website>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index f84b07cd4..7821d128d 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -4,6 +4,8 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>developer</category>
+	<category>admin</category>
 	<description>Elgg diagnostics tool</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 102daa761..f61d27c23 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>enhancement</category>
 	<description>Allows users to easily upload and embed media into text areas.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 966aa1195..aac9c3f6b 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<description>File browser plugin</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 23223bc44..466e49d61 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>admin</category>
 	<description>Perform some database cleanup tasks</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index c67a5307f..4188aa861 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>social</category>
+	<category>widget</category>
 	<description>Provides group support for elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index ba8978814..0c48bbd28 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>security</category>
 	<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>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index e54513d01..d445c5025 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
 	<description>Invite friends via email invites.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 153dfa921..ab6250ac0 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>admin</category>
 	<description>Rotate the system log at specific intervals</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 602c991d2..25c42ee93 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<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>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index e5e23f546..4b5e5c747 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<description>Elgg Pages</description>
 	<website>http://www.elgg.org</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 8ca4d10ea..6fcad14e2 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Cash Costello</author>
 	<version>1.0</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<description>Widget-based tag clouds.</description>
 	<website>http://cashcostello.com/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index a3df59e3d..5e69055d8 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -4,7 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
-	<category>extension</category>
+	<category>enhancement</category>
 	<description>TinyMCE plugin.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index b198aa0e9..bd7176620 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.7</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<description>Elgg simple twitter widget</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 5fffb0d2b..df0a7cb58 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>security</category>
 	<description>Simple user account validation via email.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 3b2dc47e8..ecbff85fe 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -4,7 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
-	<category>extension</category>
+	<category>enhancement</category>
 	<category>multimedia</category>
 	<description>This simple plugin lets users play mp3's in the page.</description>
 	<website>http://www.elgg.org/</website>
-- 
cgit v1.2.3


From 9a68be3c337ed98475535ab6b0483f53073678e1 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 24 May 2011 17:59:51 +0000
Subject: Fixes #3467. Fixed bugs in priority deps. Can now disable active
 plugins with unmet dependencies.

git-svn-id: http://code.elgg.org/elgg/trunk@9111 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggPluginPackage.php     | 13 +++----
 languages/en.php                         |  1 +
 views/default/css/admin.php              |  9 ++++-
 views/default/object/plugin/advanced.php | 61 +++++++++++++++++++-------------
 4 files changed, 50 insertions(+), 34 deletions(-)

(limited to 'languages/en.php')

diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index 9aa4af8bf..977b72d76 100644
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -457,16 +457,11 @@ class ElggPluginPackage {
 		// grab the ElggPlugin using this package.
 		$plugin_package = elgg_get_plugin_from_id($this->getID());
 		$plugin_priority = $plugin_package->getPriority();
+		$test_plugin = elgg_get_plugin_from_id($dep['plugin']);
 
-		foreach ($plugins as $test_plugin) {
-			if ($test_plugin->getID() == $dep['plugin']) {
-				break;
-			}
-		}
-
-		// If this isn't a plugin or there are no active plugins,
-		// we can't satisfy this dep.
-		if (!$plugin_package || !$plugins) {
+		// If this isn't a plugin or the plugin isn't installed or active
+		// priority doesn't matter. Use requires to check if a plugin is active.
+		if (!$plugin_package || !$test_plugin || !$test_plugin->isActive()) {
 			return array(
 				'status' => true,
 				'value' => 'uninstalled'
diff --git a/languages/en.php b/languages/en.php
index 509de7fb0..83fb66dad 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -661,6 +661,7 @@ $english = array(
 	'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',
 	'admin:plugins:dependencies:name' => 'Name',
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index c4dacad91..744211a20 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1179,12 +1179,19 @@ ul.admin_plugins {
 .elgg-plugin.elgg-state-inactive {
 	background: #dedede;
 }
-.elgg-dependency.elgg-state-error {
+
+.elgg-state-error {
 	background: #fbe3e4;
 	color: #8a1f11;
 	border-color: #fbc2c4;
 	font-weight: bold;
 }
+.elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
 
 .admin_notices {
 	padding-bottom: 15px;
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 9aed4163c..56e680ad5 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -20,7 +20,6 @@ $actions_base = '/action/admin/plugins/';
 
 $ts = time();
 $token = generate_action_token($ts);
-$active_class = ($active && $can_activate) ? 'elgg-state-active' : 'elgg-state-inactive';
 
 // build reordering links
 $links = '';
@@ -80,33 +79,42 @@ if ($priority < $max_priority) {
 }
 
 // activate / deactivate links
-if ($can_activate) {
-	if ($active) {
-		$action = 'deactivate';
-		$class = 'elgg-button-cancel';
-	} else {
-		$action = 'activate';
-		$class = 'elgg-button-submit';
+
+// always let them deactivate
+$options = array(
+	'is_action' => true
+);
+if ($active) {
+	$active_class = 'elgg-state-active';
+	$action = 'deactivate';
+	$options['text'] = elgg_echo('deactivate');
+	$options['class'] = "elgg-button elgg-button-cancel";
+
+	if (!$can_activate) {
+		$active_class = 'elgg-state-active';
+		$options['class'] = 'elgg-button elgg-state-warning';
 	}
+} else if ($can_activate) {
+	$active_class = 'elgg-state-inactive';
+	$action = 'activate';
+	$options['text'] = elgg_echo('activate');
+	$options['class'] = "elgg-button elgg-button-submit";
+} else {
+	$active_class = 'elgg-state-inactive';
+	$action = '';
+	$options['text'] = elgg_echo('admin:plugins:cannot_activate');
+	$options['class'] = "elgg-button elgg-button-disabled";
+	$options['disabled'] = 'disabled';
+}
 
+if ($action) {
 	$url = elgg_http_add_url_query_elements($actions_base . $action, array(
-		'plugin_guids[]' => $plugin->guid,
-		'is_action' => true
+		'plugin_guids[]' => $plugin->guid
 	));
 
-	$action_button = elgg_view('output/url', array(
-		'href' 		=> $url,
-		'text'		=> elgg_echo($action),
-		'is_action'	=> true,
-		'class'		=> "elgg-button $class"
-	));
-} else {
-	$action_button = elgg_view('output/url', array(
-		'text'		=> elgg_echo('admin:plugins:cannot_activate'),
-		'disabled'	=> 'disabled',
-		'class'		=> "elgg-button elgg-button-action elgg-state-disabled"
-	));
+	$options['href'] = $url;
 }
+$action_button = elgg_view('output/url', $options);
 
 // Display categories
 $categories_html = '';
@@ -202,8 +210,13 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 			}
 	
 			if (!$can_activate) {
-				$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
-				echo "<p class=\"elgg-state-error\">$message</p>";
+				if ($active) {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies_active');
+					echo "<p class=\"elgg-state-warning\">$message</p>";
+				} else {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
+					echo "<p class=\"elgg-state-error\">$message</p>";
+				}
 			}
 			?>
 	
-- 
cgit v1.2.3


From 22f8de74875e5351fd7711f3b7b2b430c98f1c05 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 7 Jun 2011 22:58:46 +0000
Subject: Refs #3510, #3418. Merged fix for forwarding after output to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9141 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/group.php    | 5 +++--
 engine/lib/sessions.php | 9 +++++++--
 languages/en.php        | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'languages/en.php')

diff --git a/engine/lib/group.php b/engine/lib/group.php
index d78274961..755482b00 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -276,8 +276,9 @@ function group_gatekeeper($forward = true) {
 
 	if ($forward && $allowed == false) {
 		register_error(elgg_echo('membershiprequired'));
-		forward($url, 'member');
-		exit;
+		if (!forward($url, 'member')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 
 	return $allowed;
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index ae42956a9..407bb69c5 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -472,7 +472,10 @@ function gatekeeper() {
 	if (!elgg_is_logged_in()) {
 		$_SESSION['last_forward_from'] = current_page_url();
 		register_error(elgg_echo('loggedinrequired'));
-		forward('', 'login');
+
+		if (!forward('', 'login')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 }
 
@@ -487,7 +490,9 @@ function admin_gatekeeper() {
 	if (!elgg_is_admin_logged_in()) {
 		$_SESSION['last_forward_from'] = current_page_url();
 		register_error(elgg_echo('adminrequired'));
-		forward('', 'admin');
+		if (!forward('', 'admin')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 }
 
diff --git a/languages/en.php b/languages/en.php
index 83fb66dad..46ac19a34 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -170,6 +170,7 @@ $english = array(
 	'ConfigurationException:NoSiteID' => "No site ID has been specified.",
 	'SecurityException:APIAccessDenied' => "Sorry, API access has been disabled by the administrator.",
 	'SecurityException:NoAuthMethods' => "No authentication methods were found that could authenticate this API request.",
+	'SecurityException:UnexpectedOutputInGatekeeper' => 'Unexpected output in gatekeeper call. Halting execution for security. Search http://docs.elgg.org/ for more information.',
 	'InvalidParameterException:APIMethodOrFunctionNotSet' => "Method or function not set in call in expose_method()",
 	'InvalidParameterException:APIParametersArrayStructure' => "Parameters array structure is incorrect for call to expose method '%s'",
 	'InvalidParameterException:UnrecognisedHttpMethod' => "Unrecognised http method %s for api method '%s'",
-- 
cgit v1.2.3


From a7274e5b6ade1a47e2bda837ddf01b5a2087c198 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 9 Jun 2011 17:50:25 +0000
Subject: Refs #2871 filter plugins by active/inactive state

git-svn-id: http://code.elgg.org/elgg/trunk@9152 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                         |  2 ++
 views/default/admin/plugins/advanced.php | 35 +++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 46ac19a34..a3ee4e421 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -594,6 +594,8 @@ $english = array(
 	'admin:footer:blog' => 'Elgg Blog',
 
 	'admin:plugins:category:all' => 'All plugins',
+	'admin:plugins:category:active' => 'Active plugins',
+	'admin:plugins:category:inactive' => 'Inactive plugins',
 	'admin:plugins:category:admin' => 'Admin',
 	'admin:plugins:category:bundled' => 'Bundled',
 	'admin:plugins:category:content' => 'Content',
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 4cefa0b3e..dad1b778d 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -10,7 +10,7 @@
 
 elgg_generate_plugin_entities();
 $installed_plugins = elgg_get_plugins('any');
-$show_category = get_input('category', null);
+$show_category = get_input('category', 'all');
 
 // Get a list of the all categories
 // and trim down the plugin list if we're not viewing all categories.
@@ -26,9 +26,28 @@ foreach ($installed_plugins as $id => $plugin) {
 
 	// handle plugins that don't declare categories
 	// unset them here because this is the list we foreach
-	if ($show_category && !in_array($show_category, $plugin_categories)) {
-		unset($installed_plugins[$id]);
+	switch ($show_category) {
+		case 'all':
+			break;
+		case 'active':
+			if (!$plugin->isActive()) {
+				unset($installed_plugins[$id]);
+			}
+			break;
+		case 'inactive':
+			if ($plugin->isActive()) {
+				unset($installed_plugins[$id]);
+			}
+			break;
+		default:
+			if (!in_array($show_category, $plugin_categories)) {
+				unset($installed_plugins[$id]);
+			}
+			break;
 	}
+	//if ($show_category && !in_array($show_category, $plugin_categories)) {
+	//	unset($installed_plugins[$id]);
+	//}
 
 	if (isset($plugin_categories)) {
 		foreach ($plugin_categories as $category) {
@@ -41,7 +60,13 @@ foreach ($installed_plugins as $id => $plugin) {
 
 asort($categories);
 
-$categories = array_merge(array('' => elgg_echo('admin:plugins:category:all')), $categories);
+$common_categories = array(
+	'all' => elgg_echo('admin:plugins:category:all'),
+	'active' => elgg_echo('admin:plugins:category:active'),
+	'inactive' => elgg_echo('admin:plugins:category:inactive'),
+);
+
+$categories = array_merge($common_categories, $categories);
 
 $category_dropdown = elgg_view('input/dropdown', array(
 	'name' => 'category',
@@ -62,7 +87,7 @@ $category_form = elgg_view('input/form', array(
 ));
 
 // @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.
-if (!isset($show_category) || empty($show_category)) {
+if ($show_category == 'all') {
 	$activate_url = "action/admin/plugins/activate_all";
 	$activate_url = elgg_add_action_tokens_to_url($activate_url);
 	$deactivate_url = "action/admin/plugins/deactivate_all";
-- 
cgit v1.2.3


From 92819a1cd4ac44607c35de069a1edf8ef5bc4048 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 9 Jun 2011 18:49:15 +0000
Subject: Refs #2871 adding sorting to advanced plugin page

git-svn-id: http://code.elgg.org/elgg/trunk@9153 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                             |  4 ++
 views/default/admin/plugins/advanced.php     | 76 ++++++++++++++++++++++------
 views/default/forms/admin/plugins/filter.php | 24 +++++++++
 views/default/forms/admin/plugins/sort.php   | 24 +++++++++
 4 files changed, 112 insertions(+), 16 deletions(-)
 create mode 100644 views/default/forms/admin/plugins/filter.php
 create mode 100644 views/default/forms/admin/plugins/sort.php

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index a3ee4e421..923647882 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -609,6 +609,10 @@ $english = array(
 	'admin:plugins:category:theme' => 'Themes',
 	'admin:plugins:category:widget' => 'Widgets',
 
+	'admin:plugins:sort:priority' => 'Priority',
+	'admin:plugins:sort:alpha' => 'Alphabetical',
+	'admin:plugins:sort:date' => 'Newest',
+
 	'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
 	'admin:plugins:markdown:unknown_file' => 'Unknown file.',
 
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index dad1b778d..deae9dcdd 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -11,6 +11,7 @@
 elgg_generate_plugin_entities();
 $installed_plugins = elgg_get_plugins('any');
 $show_category = get_input('category', 'all');
+$sort = get_input('sort', 'priority');
 
 // Get a list of the all categories
 // and trim down the plugin list if we're not viewing all categories.
@@ -45,9 +46,6 @@ foreach ($installed_plugins as $id => $plugin) {
 			}
 			break;
 	}
-	//if ($show_category && !in_array($show_category, $plugin_categories)) {
-	//	unset($installed_plugins[$id]);
-	//}
 
 	if (isset($plugin_categories)) {
 		foreach ($plugin_categories as $category) {
@@ -58,6 +56,34 @@ foreach ($installed_plugins as $id => $plugin) {
 	}
 }
 
+// sort plugins
+switch ($sort) {
+	case 'date':
+		$plugin_list = array();
+		foreach ($installed_plugins as $plugin) {
+			$create_date = $plugin->getTimeCreated();
+			while (isset($plugin_list[$create_date])) {
+				$create_date++;
+			}
+			$plugin_list[$create_date] = $plugin;
+		}
+		krsort($plugin_list);
+		break;
+	case 'alpha':
+		$plugin_list = array();
+		foreach ($installed_plugins as $plugin) {
+			$plugin_list[$plugin->getManifest()->getName()] = $plugin;
+		}
+		ksort($plugin_list);
+		break;
+	case 'priority':
+	default:
+		$plugin_list = $installed_plugins;
+		break;
+}
+
+
+
 asort($categories);
 
 $common_categories = array(
@@ -67,25 +93,43 @@ $common_categories = array(
 );
 
 $categories = array_merge($common_categories, $categories);
+// security - only want a defined option
+if (!array_key_exists($show_category, $categories)) {
+	$show_category = reset($categories);
+}
 
-$category_dropdown = elgg_view('input/dropdown', array(
-	'name' => 'category',
-	'options_values' => $categories,
-	'value' => $show_category
+$category_form = elgg_view_form('admin/plugins/filter', array(
+	'action' => 'admin/plugins/advanced',
+	'method' => 'get',
+	'disable_security' => true,
+), array(
+	'category' => $show_category,
+	'category_options' => $categories,
+	'sort' => $sort,
 ));
 
-$category_button = elgg_view('input/submit', array(
-	'value' => elgg_echo('filter'),
-	'class' => 'elgg-button elgg-button-action'
-));
 
-$category_form = elgg_view('input/form', array(
-	'body' => $category_dropdown . $category_button,
-	'method' => 'get',
+$sort_options = array(
+	'priority' => elgg_echo('admin:plugins:sort:priority'),
+	'alpha' => elgg_echo('admin:plugins:sort:alpha'),
+	'date' => elgg_echo('admin:plugins:sort:date'),
+);
+// security - only want a defined option
+if (!array_key_exists($sort, $sort_options)) {
+	$sort = reset($sort_options);
+}
+
+$sort_form = elgg_view_form('admin/plugins/sort', array(
 	'action' => 'admin/plugins/advanced',
+	'method' => 'get',
 	'disable_security' => true,
+), array(
+	'sort' => $sort,
+	'sort_options' => $sort_options,
+	'category' => $show_category,
 ));
 
+
 // @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.
 if ($show_category == 'all') {
 	$activate_url = "action/admin/plugins/activate_all";
@@ -101,7 +145,7 @@ if ($show_category == 'all') {
 	$buttons = '';
 }
 
-$buttons .= $category_form;
+$buttons .= $category_form . $sort_form;
 
 // construct page header
 ?>
@@ -112,7 +156,7 @@ $buttons .= $category_form;
 <div id="elgg-plugin-list">
 <?php
 
-echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false); 
+echo elgg_view_entity_list($plugin_list, 0, 0, 0, true, false, false);
 
 ?>
 </div>
\ No newline at end of file
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
new file mode 100644
index 000000000..d00906e6a
--- /dev/null
+++ b/views/default/forms/admin/plugins/filter.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Category filter for plugins
+ *
+ * @uses $vars['category']
+ * @uses $vars['category_options']
+ * @uses $vvars['sort']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'category',
+	'options_values' => $vars['category_options'],
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'sort',
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('filter'),
+	'class' => 'elgg-button elgg-button-action',
+));
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
new file mode 100644
index 000000000..284e085e6
--- /dev/null
+++ b/views/default/forms/admin/plugins/sort.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Sort plugins form body
+ *
+ * @uses $vars['sort']
+ * @uses $vars['sort_options']
+ * @uses $vars['category']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'sort',
+	'options_values' => $vars['sort_options'],
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'category',
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('sort'),
+	'class' => 'elgg-button elgg-button-action'
+));
-- 
cgit v1.2.3


From bc1e94ecb39bf8fff95d8cd425ce40180e0d7edd Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 9 Jun 2011 20:48:23 +0000
Subject: Refs #3410 all admin menu items have consistent capitalization

git-svn-id: http://code.elgg.org/elgg/trunk@9160 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                   | 2 +-
 mod/diagnostics/languages/en.php   | 2 +-
 mod/externalpages/languages/en.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 923647882..a34f3e1f5 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -377,7 +377,7 @@ $english = array(
 	'profile:twitter' => "Twitter username",
 	'profile:saved' => "Your profile was successfully saved.",
 
-	'admin:appearance:profile_fields' => 'Edit profile fields',
+	'admin:appearance:profile_fields' => 'Edit Profile Fields',
 	'profile:edit:default' => 'Edit profile fields',
 	'profile:label' => "Profile label",
 	'profile:type' => "Profile type",
diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 0b90957f9..6d71945e3 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -7,7 +7,7 @@
 
 	$english = array(
 
-			'admin:utilities:diagnostics' => 'System diagnostics',
+			'admin:utilities:diagnostics' => 'System Diagnostics',
 			'diagnostics' => 'System diagnostics',
 			'diagnostics:report' => 'Diagnostics Report',
 			'diagnostics:unittester' => 'Unit Tests',
diff --git a/mod/externalpages/languages/en.php b/mod/externalpages/languages/en.php
index 196a04c0b..5f0f4ad7b 100644
--- a/mod/externalpages/languages/en.php
+++ b/mod/externalpages/languages/en.php
@@ -9,7 +9,7 @@ $english = array(
 	 * Menu items and titles
 	 */
 	'expages' => "Site pages",
-	'admin:appearance:expages' => "Site pages",
+	'admin:appearance:expages' => "Site Pages",
 	'expages:about' => "About",
 	'expages:terms' => "Terms",
 	'expages:privacy' => "Privacy",
-- 
cgit v1.2.3


From 4f984fc470900df2a2c18dff02895ea2f230e099 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 19:14:25 +0000
Subject: added user avatar river messages back

git-svn-id: http://code.elgg.org/elgg/trunk@9181 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/avatar/crop.php   | 3 +++
 actions/avatar/upload.php | 4 ++++
 languages/en.php          | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'languages/en.php')

diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index ed5faecfa..9c57530ae 100644
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -65,5 +65,8 @@ $owner->y1 = $y1;
 $owner->y2 = $y2;
 
 system_message(elgg_echo('avatar:crop:success'));
+$view = 'river/user/default/profileiconupdate';
+elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+add_to_river($view, 'update', $owner->guid, $owner->guid);
 
 forward(REFERER);
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 052212e97..e21aa49c8 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -50,6 +50,10 @@ foreach ($icon_sizes as $name => $size_info) {
 $owner->icontime = time();
 if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
 	system_message(elgg_echo("avatar:upload:success"));
+
+	$view = 'river/user/default/profileiconupdate';
+	elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+	add_to_river($view, 'update', $owner->guid, $owner->guid);
 }
 
 forward(REFERER);
diff --git a/languages/en.php b/languages/en.php
index a34f3e1f5..d3e6de26f 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -344,8 +344,6 @@ $english = array(
 	'friends:collections:members' => "Collection members",
 	'friends:collections:edit' => "Edit collection",
 
-	'friends:river:add' => "is now a friend with %s",
-
 	'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 
 	'avatar' => 'Avatar',
@@ -406,6 +404,8 @@ $english = array(
  */
 	'river' => "River",
 	'river:relationship:friend' => 'is now friends with',
+	'friends:river:add' => "is now a friend with %s",
+	'profile:river:iconupdate' => 'updated their profile icon',
 	'river:noaccess' => 'You do not have permission to view this item.',
 	'river:posted:generic' => '%s posted',
 	'riveritem:single:user' => 'a user',
-- 
cgit v1.2.3


From 3a70e2065861b142a298889578811aa22e9f797f Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 13 Jun 2011 00:11:51 +0000
Subject: made some language clearer on default widgets instructions

git-svn-id: http://code.elgg.org/elgg/trunk@9198 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index d3e6de26f..5751f2a71 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -721,7 +721,7 @@ $english = array(
 	'admin:appearance:default_widgets' => 'Default Widgets',
 	'admin:default_widgets:unknown_type' => 'Unknown widget type',
 	'admin:default_widgets:instructions' => 'Add, remove, position, and configure default widgets for the selected widget page.'
-		. '  These changes will apply only to new content on the site.',
+		. '  These changes will only affect new users on the site.',
 
 /**
  * User settings
-- 
cgit v1.2.3


From e6fd398eb26a9974c3f4be39d3148f6bb36e2b0e Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 18 Jun 2011 16:08:03 -0400
Subject: added "Preview" as a general term defined in language file

---
 languages/en.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'languages/en.php')

diff --git a/languages/en.php b/languages/en.php
index 5751f2a71..dcba9abc3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -775,6 +775,7 @@ $english = array(
 	'cancel' => "Cancel",
 	'saving' => "Saving ...",
 	'update' => "Update",
+	'preview' => "Preview",
 	'edit' => "Edit",
 	'delete' => "Delete",
 	'accept' => "Accept",
-- 
cgit v1.2.3