Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544

46 files changed, 252 insertions, 238 deletions

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index 483e83fab..d88eaa994 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-		<field key="author" value="Curverider" />
-		<field key="version" value="1.8" />
-		<field key="description" value="Elgg blog plugin" />
-		<field key="website" value="http://www.elgg.org/" />
-		<field key="copyright" value="(C) Curverider 2008-2010" />
-		<field key="licence" value="GNU Public License version 2" />
-		<field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.8" />
+	<field key="description" value="Elgg blog plugin" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index bb900e311..2b3366e48 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -147,6 +147,8 @@ $publish_date_input = elgg_view('input/datetime', array(
 	'value' => $values['publish_date']
 ));
 
+$categories_input = elgg_view('categories', $vars);
+
 // hidden inputs
 //$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $values['container_guid']));
 $guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $values['guid']));
@@ -202,13 +204,13 @@ $body_input
 	$access_input
 </p>
 
-
-
 <p>
 	<label for="blog_status">$status_label</label>
 	$status_input
 </p>
 
+$categories_input
+
 $guid_input
 $container_guid_input
 $forward_input
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 687b62a7e..eab7ba9c6 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="Elgg bookmarks plugin." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-		<field key="licence" value="GNU Public License version 2" />
-		<field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Elgg bookmarks plugin." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="disabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/captcha/manifest.xml b/mod/captcha/manifest.xml
index ef8b66775..60b7e2551 100644
--- a/mod/captcha/manifest.xml
+++ b/mod/captcha/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/categories/actions/save.php b/mod/categories/actions/save.php
index 21602f659..3e93b6325 100644
--- a/mod/categories/actions/save.php
+++ b/mod/categories/actions/save.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Elgg categories plugin category saver
  *
@@ -13,10 +12,10 @@
 $categories = get_input('categories');
 $categories = string_to_tag_array($categories);
 
-global $CONFIG;
 $site = $CONFIG->site;
 $site->categories = $categories;
 system_message(elgg_echo("categories:save:success"));
 
-forward($_SERVER['HTTP_REFERER']);
+elgg_delete_admin_notice('categories_admin_notice_no_categories');
 
+forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
diff --git a/mod/categories/languages/en.php b/mod/categories/languages/en.php
index 588c194e4..cbe5a608f 100644
--- a/mod/categories/languages/en.php
+++ b/mod/categories/languages/en.php
@@ -1,15 +1,12 @@
 <?php
 
-	$english = array(
-	
-		'categories' => 'Categories',
-		'categories:settings' => 'Set site categories',	
-		'categories:explanation' => 'To set some predefined site-wide categories that will be used throughout your system, enter them below, separated with commas. Compatible tools will then display them when the user creates or edits content.',	
-		'categories:save:success' => 'Site categories were successfully saved.',
-		'categories:results' => "Results for the site category: %s",
-	
-	);
-					
-	add_translation("en",$english);
+$english = array(
+	'categories' => 'Categories',
+	'categories:settings' => 'Set site categories',
+	'categories:explanation' => 'To set some predefined site-wide categories that will be used throughout your system, enter them below, separated with commas. Compatible tools will then display them when the user creates or edits content.',
+	'categories:save:success' => 'Site categories were successfully saved.',
+	'categories:results' => "Results for the site category: %s",
+	'categories:on_enable_reminder' => "You haven't added any categories yet!  <a href=\"%s\">Add categories now.</a>",
+);
 
-?>
\ No newline at end of file
+add_translation("en",$english);
\ No newline at end of file
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 443872e57..635543ee3 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="Site wide categories" />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="name" value="Site-wide Categories" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Site-wide Categories lets administrators define categories that users across the site can add content to." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
+	<field key="on_enable" value="categories_on_enable" />
+	<field key="on_disable" value="categories_on_disable" />
 </plugin_manifest>
diff --git a/mod/categories/start.php b/mod/categories/start.php
index dd6da16d5..60ee01065 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -15,52 +15,39 @@
  *
  */
 function categories_init() {
-
 	global $CONFIG;
 
 	elgg_extend_view('css', 'categories/css');
 
-	register_action('categories/save',false,$CONFIG->pluginspath . 'categories/actions/save.php',true);
+	register_action('settings/categories/save', FALSE, $CONFIG->pluginspath . 'categories/actions/save.php', TRUE);
 
 	register_page_handler('categories', 'categories_page_handler');
 
+	register_elgg_event_handler('update','all','categories_save');
+	register_elgg_event_handler('create','all','categories_save');
 }
 
-/**
- * Set up admin menu item
- *
- */
-function categories_pagesetup() {
-	if (get_context() == 'admin' && isadminloggedin()) {
-		global $CONFIG;
-		add_submenu_item(elgg_echo('categories:settings'), $CONFIG->wwwroot . 'mod/categories/settings.php');
-	}
-}
 
 /**
  * Page handler
  *
  */
 function categories_page_handler() {
-
 	include(dirname(__FILE__) . "/listing.php");
-	return true;
+	return TRUE;
 }
 
 /**
- * Save site categories
+ * Save site categories to and object upon save / edit
  *
  */
 function categories_save($event, $object_type, $object) {
-
 	if ($object instanceof ElggEntity) {
-
 		$marker = get_input('universal_category_marker');
 
 		if ($marker == 'on') {
-
 			$categories = get_input('universal_categories_list');
-			
+
 			if (empty($categories)) {
 				$categories = array();
 			}
@@ -68,12 +55,26 @@ function categories_save($event, $object_type, $object) {
 			$object->universal_categories = $categories;
 		}
 	}
+	return TRUE;
+}
 
-	return true;
+/**
+ * Add a reminder to set default categories.
+ */
+function categories_on_enable() {
+	if (!$site->categories) {
+		global $CONFIG;
+		$message = sprintf(elgg_echo('categories:on_enable_reminder'), "{$CONFIG->url}pg/admin/plugin_settings/categories");
+		elgg_add_admin_notice('categories_admin_notice_no_categories', $message);
+	}
+	return TRUE;
 }
 
+/**
+ * Clean up admin notices on disable.
+ */
+function categories_on_disable() {
+	elgg_delete_admin_notice('categories_admin_notice_no_categories');
+}
 
-register_elgg_event_handler('init','system','categories_init');
-register_elgg_event_handler('pagesetup','system','categories_pagesetup');
-register_elgg_event_handler('update','all','categories_save');
-register_elgg_event_handler('create','all','categories_save');
+register_elgg_event_handler('init','system','categories_init');
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/css.php b/mod/categories/views/default/categories/css.php
index d2cf5a8a8..6dfe60047 100644
--- a/mod/categories/views/default/categories/css.php
+++ b/mod/categories/views/default/categories/css.php
@@ -1,11 +1,11 @@
 <?php
-	/**
-	 * Categories CSS extender
-	 * 
-	 * @package Elgg File Repository
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
+/**
+ * Categories CSS extender
+ *
+ * @package Categories
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 ?>
 
 .categories .input-checkboxes {
@@ -25,13 +25,13 @@
 }
 #two_column_left_sidebar_maincontent .contentWrapper .categories {
 	border:1px solid #CCCCCC;
-	-webkit-border-radius: 4px; 
+	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	padding:5px;
-	margin:0 0 15px 0;	
+	margin:0 0 15px 0;
 }
 #two_column_left_sidebar_maincontent .contentWrapper .categories p {
-	margin:0;	
+	margin:0;
 }
 #two_column_left_sidebar_maincontent .contentWrapper .blog_post .categories {
 	border:none;
@@ -41,10 +41,10 @@
 
 #two_column_left_sidebar .blog_categories {
 	background:white;
-	-webkit-border-radius: 8px; 
+	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
-    padding:10px;
-    margin:0 10px 10px 10px;
+	padding:10px;
+	margin:0 10px 10px 10px;
 }
 #two_column_left_sidebar .blog_categories h2 {
 	background:none;
diff --git a/mod/categories/views/default/categories/settings.php b/mod/categories/views/default/categories/settings.php
deleted file mode 100644
index 7f38b6579..000000000
--- a/mod/categories/views/default/categories/settings.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-echo elgg_view_title(elgg_echo('categories:settings'));
-
-?>
-
-<div class="contentWrapper">
-	<p>
-		<?php echo elgg_echo('categories:explanation'); ?>
-	</p>
-
-
-	<?php
-
-	echo elgg_view('input/form', array(
-							'action' => $vars['url'] . 'action/categories/save',
-							'method' => 'post',
-							'body' => elgg_view('categories/settingsform',$vars)
-							)
-					);
-
-	?>
-
-</div>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/settingsform.php b/mod/categories/views/default/categories/settingsform.php
deleted file mode 100644
index 044f01dcd..000000000
--- a/mod/categories/views/default/categories/settingsform.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-	echo elgg_view('input/tags',array('value' => $vars['categories'],
-									  'internalname' => 'categories'));
-
-?>
-	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
\ No newline at end of file
diff --git a/mod/categories/settings.php b/mod/categories/views/default/settings/categories/edit.php
index 260b057c3..3742fd1e6 100644
--- a/mod/categories/settings.php
+++ b/mod/categories/views/default/settings/categories/edit.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Elgg categories plugin settings page
  *
@@ -10,15 +9,7 @@
  * @link http://elgg.com/
  */
 
-// Load engine and restrict to admins 
-require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-admin_gatekeeper();
-
-// Set context
-set_context('admin');
-
 // Get site and categories
-global $CONFIG;
 $site = $CONFIG->site;
 $categories = $site->categories;
 
@@ -26,10 +17,12 @@ if (empty($categories)) {
 	$categories = array();
 }
 
-// Load category save view
-$body = elgg_view('categories/settings',array('categories' => $categories));
-
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $body);
-
-page_draw(elgg_echo('categories:settings'), $body);
+?>
+<div class="contentWrapper">
+	<p>
+		<?php echo elgg_echo('categories:explanation'); ?>
+	</p>
+	<?php
+		echo elgg_view('input/tags', array('value' => $categories, 'internalname' => 'categories'));
+	?>
+</div>
\ No newline at end of file
diff --git a/mod/crontrigger/manifest.xml b/mod/crontrigger/manifest.xml
index 3728534b5..8058ebb1e 100644
--- a/mod/crontrigger/manifest.xml
+++ b/mod/crontrigger/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index 2fb36cf22..16e648f54 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="A simple plugin to replace the sites index page with boxes containing the latest content from the site." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="A simple plugin to replace the sites index page with boxes containing the latest content from the site." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/defaultwidgets/manifest.xml b/mod/defaultwidgets/manifest.xml
index 8388e5803..2fa825d6c 100644
--- a/mod/defaultwidgets/manifest.xml
+++ b/mod/defaultwidgets/manifest.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Milan Magudia &amp; Curverider" />
-        <field key="version" value="2.04" />
-        <field key="description" value="This plugin enables an administrator to define a default set of widgets for new users" />
-        <field key="copyright" value="HedgeHogs &amp; Curverider Ltd" />
-		<field key="licence" value="GNU Public License version 2" />      
-		<field key="elgg_version" value="2010030101" />  
+	<field key="author" value="Milan Magudia &amp; Curverider" />
+	<field key="version" value="2.04" />
+	<field key="description" value="This plugin enables an administrator to define a default set of widgets for new users" />
+	<field key="copyright" value="HedgeHogs &amp; Curverider Ltd" />
+	<field key="licence" value="GNU Public License version 2" />      
+	<field key="elgg_version" value="2010030101" />  
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index f9a725966..1e1df8881 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/ecml/manifest.xml b/mod/ecml/manifest.xml
index f74c78de0..77ece69de 100644
--- a/mod/ecml/manifest.xml
+++ b/mod/ecml/manifest.xml
@@ -11,4 +11,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/ecml/start.php b/mod/ecml/start.php
index 4ea50766e..c0ce1d4d6 100644
--- a/mod/ecml/start.php
+++ b/mod/ecml/start.php
@@ -36,7 +36,7 @@ function ecml_init() {
 	elgg_extend_view('css', 'ecml/admin/css');
 
 	// admin action to save permissions
-	register_action('ecml/save_permissions', FALSE, dirname(__FILE__) . '/actions/save_permissions.php', TRUE);
+	register_action('settings/ecml/save', FALSE, dirname(__FILE__) . '/actions/save_permissions.php', TRUE);
 
 	// show ECML-enabled icon on free-text input areas
 	elgg_extend_view('input/longtext',  'ecml/input_ext', 0);
@@ -78,7 +78,7 @@ function ecml_init() {
 function ecml_pagesetup(){
 	if (get_context() == 'admin' && isadminloggedin()) {
 		global $CONFIG;
-		add_submenu_item(elgg_echo('ecml'), $CONFIG->wwwroot . 'pg/ecml_admin');
+
 	}
 }
 
diff --git a/mod/ecml/views/default/ecml/admin/ecml_admin.php b/mod/ecml/views/default/settings/ecml/edit.php
index b7038b54c..1ad88aa9b 100644
--- a/mod/ecml/views/default/ecml/admin/ecml_admin.php
+++ b/mod/ecml/views/default/settings/ecml/edit.php
@@ -16,7 +16,6 @@ $perms = $vars['config']->ecml_permissions;
 ksort($views);
 ksort($keywords);
 
-echo elgg_view_title(elgg_echo('ecml:admin'));
 echo '<p class="margin_top">' . elgg_echo('ecml:admin:instruction') . '</p>';
 
 // yes I'm using a table because this is table.
@@ -67,13 +66,8 @@ foreach ($keywords as $keyword => $keyword_info) {
 }
 
 $form_body .= '</table>';
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('submit')));
-$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'cancel_button'));
 
-echo elgg_view('input/form', array(
-	'body' => $form_body,
-	'action' => $vars['url'] . 'action/ecml/save_permissions'
-));
+echo $form_body;
 
 ?>
 <script type="text/javascript">
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index a14e99b4b..f0f82a699 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2009-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index 3793d7803..52da20256 100644
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="This is a very simple plugin that lets site admin populate an about page, terms, privacy and contact. You can also edit the frontpage text." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="This is a very simple plugin that lets site admin populate an about page, terms, privacy and contact. You can also edit the frontpage text." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index f3f44d3bf..444d2ac80 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="File browser plugin" />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="File browser plugin" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/friends/manifest.xml b/mod/friends/manifest.xml
index faed8ce63..8cdd8c6bd 100644
--- a/mod/friends/manifest.xml
+++ b/mod/friends/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(c) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 805cce48e..a806dd916 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 86a7dfa1d..523b060ac 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index e71e614d0..045a9a670 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -2,9 +2,11 @@
 <plugin_manifest>
 	<field key="author" value="Curverider Ltd" />
 	<field key="version" value="1.5" />
-	<field key="description" value="Provide tag filtering for user input (highly recommended)." />
+	<field key="description" value="Provides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE." />
 	<field key="website" value="http://www.elgg.org/" />
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 3" />
 	<field key="elgg_version" value="2009041701" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 4e17a5d27..cf039ee13 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="Invite friends to Elgg network via email invites." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Invite friends to Elgg network via email invites." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index e47d7bb37..4ec2cdf44 100644
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 02f461815..cfbb14d8c 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index 2248f8853..37959b66e 100644
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="A simple plugin to let users browser other members." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="A simple plugin to let users browser other members." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 4c89bdc40..f66f0dd59 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="This plugin allows users to put a message board on their profile for other users to post comments." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="This plugin allows users to put a message board on their profile for other users to post comments." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index c903c7658..0c8731e76 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="version" value="1.7" />
-        <field key="description" value="Elgg internal messages plugin. This plugin lets user send each other messages." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Elgg internal messages plugin. This plugin lets user send each other messages." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index d76abc6ae..6e1f73b9c 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="Elgg notifications plugin" />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Elgg notifications plugin" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index 7e9b2c5e4..0445ed0c8 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index 902292379..a1307f24d 100644
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider ltd" />
-        <field key="version" value="1.8" />
-		<field key="category" value="bundled" />
-		<field key="category" value="social" />
-        <field key="description" value="Elgg profile plugin." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-		<field key="licence" value="GNU Public License version 2" />
-		<field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider ltd" />
+	<field key="version" value="1.8" />
+	<field key="category" value="bundled" />
+	<field key="category" value="social" />
+	<field key="description" value="Elgg profile plugin." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index 1d127cde3..e5a34ba99 100644
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/riverdashboard/manifest.xml b/mod/riverdashboard/manifest.xml
index 24133b7d4..6082cf5ec 100644
--- a/mod/riverdashboard/manifest.xml
+++ b/mod/riverdashboard/manifest.xml
@@ -6,4 +6,5 @@
 	<field key="website" value="http://www.elgg.org/" />
 	<field key="copyright" value="(C) Curverider 2010" />
 	<field key="licence" value="GNU Public License version 2" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index b54744903..0041325ad 100644
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010, MITRE 2009" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
-</plugin_manifest>
\ No newline at end of file
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
+</plugin_manifest>
diff --git a/mod/sitepages/manifest.xml b/mod/sitepages/manifest.xml
index 1ed844b9e..55affc96f 100644
--- a/mod/sitepages/manifest.xml
+++ b/mod/sitepages/manifest.xml
@@ -10,4 +10,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009030702" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 7f08072b9..6338debaf 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider, Cash Costello" />
-        <field key="version" value="1.0" />
-        <field key="description" value="Site-wide and widget-based tag clouds." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-		<field key="licence" value="GNU Public License version 2" />
-		<field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider, Cash Costello" />
+	<field key="version" value="1.0" />
+	<field key="description" value="Site-wide and widget-based tag clouds." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />	
 </plugin_manifest>
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index a4239313a..a0384b7ce 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.8" />
-        <field key="description" value="Provides a microblogging service for your Elgg site." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="recommends" value="smsclient" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.8" />
+	<field key="description" value="Provides a microblogging service for your Elgg site." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="recommends" value="smsclient" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="simple" />
 </plugin_manifest>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 139d5b7a4..a7a039c48 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -7,4 +7,6 @@
         <field key="copyright" value="(C) Curverider 2008-2010" />
         <field key="licence" value="GNU Public License version 2" />
         <field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index 5439409db..d5fecbcb5 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="Elgg simple twitter widget" />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Elgg simple twitter widget" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 944c870fb..8e29a1bbf 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -7,4 +7,6 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2009033101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/walledgarden/manifest.xml b/mod/walledgarden/manifest.xml
index 1f4b28a1b..e81af202f 100644
--- a/mod/walledgarden/manifest.xml
+++ b/mod/walledgarden/manifest.xml
@@ -7,4 +7,5 @@
 	<field key="copyright" value="(C) Curverider 2008-2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 6db4cbf47..7af57d6d9 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.7" />
-        <field key="description" value="This simple plugin lets users play mp3's in the page." />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="This simple plugin lets users play mp3's in the page." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+	<field key="elgg_install_state" value="enabled" />
+	<field key="admin_interface" value="advanced" />
 </plugin_manifest>