old activity and river removed

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

20 files changed, 0 insertions, 946 deletions

diff --git a/mod/activity/all.php b/mod/activity/all.php
deleted file mode 100644
index e4252c2ec..000000000
--- a/mod/activity/all.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-	/**
-	 * Elgg activity plugin.
-	 * 
-	 * @package ElggActivity
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-	
-	$limit = get_input('limit', 20);
-	$offset = get_input('offset');
-	$type = get_input('type');
-	$subtype = get_input('subtype');
-	$title = elgg_view_title(elgg_echo('activity:all'));
-	
-	global $autofeed;
-	$autofeed = true;
-	
-	if (elgg_get_viewtype()=='opendd'){
-		$body = elgg_view('activity/dashboard', array('activity' => activity_get_activity_opendd($limit, $offset, $type, $subtype)));
-    }else{
-    	$activity = activity_get_activity($limit, $offset, $type, $subtype);
-		$body = elgg_view('activity/dashboard', array('activity' => $activity));
-		if (count($activity))
-			$body .= elgg_view('activity/offset', array('offset' => $offset));
-    }
-	
-	page_draw(elgg_echo('activity:all'),elgg_view_layout("two_column_left_sidebar", '', $title . $body));
-
-?>
\ No newline at end of file
diff --git a/mod/activity/friends.php b/mod/activity/friends.php
deleted file mode 100644
index f3a9fa89f..000000000
--- a/mod/activity/friends.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-	/**
-	 * Elgg activity plugin.
-	 * 
-	 * @package ElggActivity
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-	
-	$owner = page_owner_entity();
-	$limit = get_input('limit', 20);
-	$offset = get_input('offset');
-	
-	$title_txt = sprintf(elgg_echo('activity:person:friends'), $owner->name);
-	$title = elgg_view_title($title_txt);
-	
-	if (elgg_get_viewtype()=='opendd')
-		$activity = activity_get_activity_opendd($limit, $offset, $type, $subtype, page_owner(), 'friend');
-	else
-		$activity = activity_get_activity($limit, $offset, $type, $subtype, page_owner(), 'friend');
-	if (count($activity)>0) {
-		
-		global $autofeed;
-		$autofeed = true;
-		
-		$body = elgg_view('activity/dashboard', array('activity' => $activity));
-		$body .= elgg_view('activity/offset', array('offset' => $offset, 'add_to_url' => 'friends'));
-	} else
-		$body = elgg_echo('activity:nofriendactivity');
-	
-	
-	
-	page_draw($title_txt, elgg_view_layout("two_column_left_sidebar", '', $title . $body));
-
-?>
\ No newline at end of file
diff --git a/mod/activity/index.php b/mod/activity/index.php
deleted file mode 100644
index 57ec5ae88..000000000
--- a/mod/activity/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-	/**
-	 * Elgg activity plugin.
-	 * 
-	 * @package ElggActivity
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-	
-	$limit = get_input('limit', 20);
-	$offset = get_input('offset');
-	$type = get_input('type');
-	$subtype = get_input('subtype');
-	$title = elgg_view_title(elgg_echo('activity:your'));
-	
-	if (page_owner())
-	{
-		global $autofeed;
-		$autofeed = true;
-		
-		if (elgg_get_viewtype()=='opendd')
-			$body = elgg_view('activity/dashboard', array('activity' => activity_get_activity_opendd($limit, $offset, $type, $subtype, page_owner())));
-		else {
-			$activity = activity_get_activity($limit, $offset, $type, $subtype, page_owner());
-			$body = elgg_view('activity/dashboard', array('activity' => $activity));
-			if (count($activity))
-				$body .= elgg_view('activity/offset', array('offset' => $offset, 'add_to_url' => 'own'));
-		}
-
-	}
-	else
-		$body = elgg_echo('activity:usernotfound');
-	
-	page_draw(elgg_echo('activity:your'),elgg_view_layout("two_column_left_sidebar", '', $title . $body));
-
-?>
\ No newline at end of file
diff --git a/mod/activity/languages/en.php b/mod/activity/languages/en.php
deleted file mode 100644
index 890192d2a..000000000
--- a/mod/activity/languages/en.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php

-	/**

-	 * Elgg activity plugin language pack.

-	 * 

-	 * @package ElggActivity

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.com/

-	 */

-

-	$english = array(

-	

-		'activity:all' => 'Site activity',

-		'activity' => 'Activity',

-		'activity:your' => 'Your activity',

-		'activity:friends' => 'Friend\'s activity',

-		'activity:person' => '%s\'s activity',

-		'activity:person:friends' => '%s\'s friend\'s activity',

-	

-		'activity:useasdashboard' => 'Do you wish to use the activity stream as the dashboard?',

-	

-		'activity:noactivity' => 'Sorry, there is currently no activity that matches your search criteria',

-		'activity:forward' => "forward",

-		'activity:back' => "back",

-	

-		'activity:usernotfound' => 'User not found',

-		'activity:nofriendactivity' => 'No activity, perhaps you should add some more friends?',

-	);

-					

-	add_translation("en",$english);

-?>
\ No newline at end of file
diff --git a/mod/activity/manifest.xml b/mod/activity/manifest.xml
deleted file mode 100644
index a5ea43406..000000000
--- a/mod/activity/manifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-	<field key="author" value="Curverider Ltd" />
-	<field key="version" value="1.0" />
-	<field key="description" value="A rich activity river providing a useful summary of activity." />
-	<field key="website" value="http://www.elgg.org/" />
-	<field key="copyright" value="(C) Curverider 2008-2009" />
-	<field key="licence" value="GNU Public License version 2" />
-</plugin_manifest>
\ No newline at end of file
diff --git a/mod/activity/opendd.php b/mod/activity/opendd.php
deleted file mode 100644
index 86d00ce4a..000000000
--- a/mod/activity/opendd.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-	/**
-	 * Elgg activity plugin opendd export of a given statement.
-	 * 
-	 * @package ElggActivity
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-	
-	$id = (int)get_input('statement_id');
-	$type = sanitise_string(get_input('statement_type'));
-	$metaname = sanitise_string(get_input('metaname'));
-	
-	$statement = construct_riverstatement_from_log(
-				get_log_entry($id)
-			);
-	
-	global $CONFIG;
-			
-	switch ($type)
-	{
-		case 'statement' : $result = activity_export_statement($statement, $id);
-						   foreach ($result as $r) $body .=  "$r"; 
-		break;
-		case 'metadata' :
-			
-			$md = activity_export_field_from_statement($statement, $id, $metaname);
-			$body .= "$md";
-		break;
-	}
-	
-	page_draw('',$body);
-?>
\ No newline at end of file
diff --git a/mod/activity/start.php b/mod/activity/start.php
deleted file mode 100644
index 06d34d51d..000000000
--- a/mod/activity/start.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-	/**
-	 * Elgg activity plugin.
-	 * 
-	 * @package ElggActivity
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	/**
-	 * Initialise the activity.
-	 *
-	 */
-	function activity_init()
-	{
-		global $CONFIG;
-		
-		// Register and optionally replace the dashboard
-		if (get_plugin_setting('useasdashboard', 'activity') == 'yes')
-			register_page_handler('dashboard','activity_page_handler');
-		
-		// Page handler
-		register_page_handler('activity','activity_page_handler');
-		
-		// Add our CSS
-		extend_view('css','activity/css');
-		
-		// Activity main menu
-		if (isloggedin())
-		{
-			add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "pg/activity/{$_SESSION['user']->username}/", array(), 'activity');
-		}
-	}
-	
-	/**
-	 * Post init gumph.
-	 */
-	function activity_page_setup()
-	{
-		global $CONFIG;
-		
-		if ((get_context()=='activity') || (get_context()=='dashboard'))
-		{
-			add_submenu_item(elgg_echo('activity:your'), $CONFIG->wwwroot."pg/activity/{$_SESSION['user']->username}/");
-			add_submenu_item(elgg_echo('activity:friends'), $CONFIG->wwwroot."pg/activity/{$_SESSION['user']->username}/friends/");
-			add_submenu_item(elgg_echo('activity:all'), $CONFIG->wwwroot."pg/activity/");
-		}
-	}
-	
-	/**
-	 * Page handler for activity.
-	 *
-	 * @param unknown_type $page
-	 */
-	function activity_page_handler($page)
-	{
-		global $CONFIG;
-		
-		if (($page[0]) && ($page[1]!='uuid')) set_input('username', $page[0]);
-		
-		if ($page[0]) {
-			if ($page[1])
-			{
-				switch ($page[1])
-				{
-					case 'friends' :
-						include($CONFIG->pluginspath . "activity/friends.php");
-					break;
-					case 'uuid' : // Endpoint for UUID export of statements
-						switch ($page[2])
-						{
-							case 'metadata' : set_input('metaname', $page[4]);
-							case 'statement' : set_input('statement_id', $page[3]);
-											  set_input('statement_type', $page[2]);
-											  elgg_set_viewtype('opendd');
-						}
-						
-						include($CONFIG->pluginspath . "activity/opendd.php");	
-					break;
-				}
-			}
-			else
-				include($CONFIG->pluginspath . "activity/index.php");	
-		} else
-			include($CONFIG->pluginspath . "activity/all.php");
-	}
-	
-	
-	
-	/**
-	 * Pull activity from the system log.
-	 * 
-	 * This works in a similar way to the river code, but looks for activity views instead.
-	 *
-	 * @param int $limit Limit the query.
-	 * @param int $offset Execute from the given object
-	 * @param mixed $type A type, or array of types to look for. Note: This is how they appear in the SYSTEM LOG.
-	 * @param mixed $subtype A subtype, or array of types to look for. Note: This is how they appear in the SYSTEM LOG.
-	 * @param mixed $owner_guid The guid or a collection of GUIDs
-	 * @param string $owner_relationship If defined, the relationship between $owner_guid and the entity owner_guid - so "is $owner_guid $owner_relationship with $entity->owner_guid"
-	 * @return array An array of pre-rendered elgg_views on the data.
-	 */
-	function activity_get_activity($limit = 10, $offset = 0, $type = "", $subtype = "", $owner_guid = "", $owner_relationship = "" )
-	{
-		global $CONFIG;
-		
-		$log_data = get_activity_stream_data($limit, $offset, $type, $subtype, $owner_guid, $owner_relationship);
-
-		// until count reached, loop through and render
-		$activity = array();
-		
-		if ($log_data)
-		{
-			foreach ($log_data as $log)
-			{
-				// See if we have access to the object we're talking about
-				$statement = construct_riverstatement_from_log($log);
-				
-				$event = $log->event;
-				$class = $log->object_class;
-				$type = $log->object_type;
-				$subtype = $log->object_subtype;
-				$tmp = new $class();
-				$object = $tmp->getObjectFromID($log->object_id);	
-				$by_user_obj = get_entity($log->performed_by_guid);
-				
-				// Belts and braces
-				if ($statement)
-				{
-					$tam = "";
-					
-					// Now construct and call the appropriate views
-					
-					if ($subtype == "widget") { // Special case for widgets
-						$subtype = "widget/" . $object->handler;
-					}
-					if ($subtype == '')
-						$subtype = 'default';
-						
-						
-					$activity_view = 'activity';	
-					if (!elgg_view_exists("$activity_view/$type/$subtype/$event"))
-						$activity_view = 'river';
-									
-					$tam = elgg_view("$activity_view/$type/$subtype/$event", array(
-						'statement' => $statement
-					));
-					
-					
-					// Giftwrap
-					if (!empty($tam)) {
-						$tam = elgg_view("activity/wrapper",array(
-									'entry' => $tam,
-									'time' => $log->time_created,
-									'event' => $event,
-									'statement' => $statement 
-						));
-					}
-					
-					$activity[] = $tam;
-				}
-			}
-		}
-		
-		return $activity;
-		
-	}
-	
-	/**
-	 * Export a given field of a statement as a bit of opendd metadata
-	 *
-	 * @param ElggRiverStatement $statement
-	 * @param int $logid The id of the log entry this was generated from
-	 * @param string $field The fieldname
-	 * @return ODDMetadata object or false if field not available.
-	 */
-	function activity_export_field_from_statement(ElggRiverStatement $statement, $logid, $field)
-	{
-		global $CONFIG;
-		
-		$result = false;
-		
-		// Convert
-		$object_return = $statement->getObject();
-		if (is_array($object_return)) {
-			
-			$object = array();
-			foreach ($object_return as $c)
-				$object[] = $c;
-		}
-		else
-			$object = $object_return;
-			
-
-		switch ($field)
-		{
-			case 'timestamp' : $value = $statement->getTimestamp(); break;
-			case 'event' : $value = $statement->getEvent(); break;
-			case 'subject' : $subject = $statement->getSubject();
-							$value = guid_to_uuid($subject->guid);		
-							break;				
-			case 'object' : 
-							if ($object instanceof ElggEntity) $value = guid_to_uuid($object->guid);
-							if ((is_array($object)) && (isset($object[0]))) {
-								if ( ($object[0] instanceof ElggEntity) || ($object[0] instanceof ElggExtender) || ($object[0] instanceof ElggRelationship))
-									$value = get_uuid_from_object($object[0]);
-								else
-									$value = $object[0];
-							}
-							break;
-			case 'object2' :
-				 
-				if ( (is_array($object)) && (isset($object[1]))) {
-					if ( ($object[1] instanceof ElggEntity) || ($object[1] instanceof ElggExtender) || ($object[1] instanceof ElggRelationship))
-						$value = get_uuid_from_object($object[1]);
-					else
-						$value = $object[1];
-				}
-				
-				break;
-			case 'object3' :
-				 
-				if ( (is_array($object)) && (isset($object[2]))) {
-					if ( ($object[2] instanceof ElggEntity) || ($object[2] instanceof ElggExtender) || ($object[2] instanceof ElggRelationship))
-						$value = get_uuid_from_object($object[2]);
-					else
-						$value = $object[2];
-				}
-				
-				break;
-			
-		}
-		
-		//$md = new ODDMetaData("{$CONFIG->url}pg/activity/export/uuid/metadata/$id/$metaname/", "{$CONFIG->url}pg/activity/export/uuid/metadata/$id/", $metaname, $value);
-		if ($value)
-			$result = new ODDMetaData("{$CONFIG->url}pg/activity/export/uuid/metadata/$logid/$field/", "{$CONFIG->url}pg/activity/export/uuid/metadata/$logid/", $field, $value);
-
-		return $result;
-	}
-	
-	/**
-	 * Export an Elgg river statement as OpenDD
-	 *
-	 * @param ElggRiverStatement $statement
-	 * @param int $logid The id of the log entry this was generated from
-	 */
-	function activity_export_statement(ElggRiverStatement $statement, $logid)
-	{
-		global $CONFIG;
-		
-		$result = array();
-		
-		// Export activity
-		$result[] = new ODDEntity("{$CONFIG->url}pg/activity/export/uuid/statement/$logid/", 'riverstatement');
-		
-		foreach ( 
-				array(
-				'timestamp', 
-				'subject', 
-				'object', 
-				'object2', 
-				'object3', 
-				'event') as $field
-		)
-			$result[] = activity_export_field_from_statement($statement, $logid, $field);
-			
-		
-		return $result;
-	}
-	
-	/**
-	 * Get the activity stream and output it as an opendd feed of data
-	 *
-	 * @param unknown_type $limit
-	 * @param unknown_type $offset
-	 * @param unknown_type $type
-	 * @param unknown_type $subtype
-	 * @param unknown_type $owner_guid
-	 * @param unknown_type $owner_relationship
-	 */
-	function activity_get_activity_opendd($limit = 10, $offset = 0, $type = "", $subtype = "", $owner_guid = "", $owner_relationship = "" )
-	{
-		global $CONFIG;
-		
-		$log_data = get_activity_stream_data($limit, $offset, $type, $subtype, $owner_guid, $owner_relationship);
-
-		// until count reached, loop through and render
-		$activity = array();
-		
-		if ($log_data)
-		{
-			foreach ($log_data as $log)
-			{
-				// See if we have access to the object we're talking about
-				$statement = construct_riverstatement_from_log($log);
-				
-				$event = $log->event;
-				$class = $log->object_class;
-				$type = $log->object_type;
-				$subtype = $log->object_subtype;
-				$tmp = new $class();
-				$object = $tmp->getObjectFromID($log->object_id);	
-				$by_user_obj = get_entity($log->performed_by_guid);
-				
-				// Belts and braces
-				if ($statement)
-				{
-					$activity[] = activity_export_statement($statement, $log->id);
-				}
-			}
-		}
-		
-		return $activity;
-	}
-	
-	
-	
-	// river index with tabs to drill down
-	
-	
-	
-	
-	/// BONUS POINTS
-	
-	// comment on feed items
-	
-	// comment on search terms/ tags
-	
-	
-	// Initialise plugin
-	register_elgg_event_handler('init','system','activity_init');
-	register_elgg_event_handler('pagesetup','system','activity_page_setup');
-?>
\ No newline at end of file
diff --git a/mod/activity/views/default/activity/css.php b/mod/activity/views/default/activity/css.php
deleted file mode 100644
index 506fdd096..000000000
--- a/mod/activity/views/default/activity/css.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Activity CSS
-	 * 
-	 * @package ElggBookmarks
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
-
-?>
-
-
-/* ***************************************
-	ACTIVITY
-*************************************** */
-.activity_item p {
-	margin:0;
-	padding:2px 0 0 0;
-	line-height:1.1em;
-	min-height:17px;	
-}
-.activity_item .activity_item_time {
-	font-size:90%;
-	color:#666666;
-}
-#activity {
-	border-top:1px solid #dddddd;
-}
-#activity .activity_item p {
-	margin:0;
-	padding:2px 0 0 20px;
-	line-height:1.1em;
-	min-height:17px;
-}
-#activity .activity_item {
-	border-bottom:1px solid #dddddd;
-	padding:2px 0 2px 0;
-}
-#activity .river_item_time {
-	font-size:90%;
-	color:#666666;
-}
-/* IE6 fix */
-* html #activity .river_item p { 
-	padding:3px 0 3px 20px;
-}
-/* IE7 */
-*:first-child+html #activity .river_item p {
-	min-height:17px;
-}
-
-#activity .activity_file_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
-}
-#activity .activity_file_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
-}
-#activity .activity_status_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
-}
-#activity .activity_user_profileupdate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
-}
-#activity .activity_user_profileiconupdate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
-}
-#activity .activity_relationship_friend_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
-}
-#activity .activity_bookmarks_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px;
-}
-#activity .activity_blog_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
-}
-#activity .activity_widget_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
-}
-#activity .activity_blog_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
-}
-#activity .activity_blog_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
-}
-#activity .activity_status_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px;
-}
-#activity .activity_forums_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
-}
-#activity .activity_forums_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
-}
-#activity .activity_forumtopic_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
-}
-#activity .activity_relationship_member_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
-}
-#activity .activity_groupforumtopic_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;	
-}
-/* post to wire */
-#activity .activity_thewire_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px;	
-}
-#activity .activity_groupforumtopic_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
-}
-/* comment on page */
-#activity .activity_page_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;	
-}
-#activity .activity_page_top_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;	
-}
-/* create a page */
-#activity .activity_page_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;	
-}
-#activity .activity_page_top_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;	
-}
-/* updated a page */
-#activity .activity_page_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;	
-}
-#activity .activity_page_top_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;	
-}
-
-.river_content {
-	margin:10px;
-	padding:4px;
-	border:1px solid #ddd;
-	background:#efefef;
-}
-
-.pagination .forward,
-.pagination .back {
-	display:block;
-	float:left;
-	border:1px solid #4690d6;
-	color:#4690d6;
-	text-align: center;
-	font-size: 12px;
-	font-weight: normal;
-	margin:0 6px 0 0;
-	padding:0px 4px;
-	cursor: pointer;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-}
-.pagination .forward:hover,
-.pagination .back:hover {
-	background:#4690d6;
-	color:white;
-	text-decoration: none;
-}
-.pagination .back {
-	margin:0 20px 0 0;
-}
-
-
-
-
diff --git a/mod/activity/views/default/activity/dashboard.php b/mod/activity/views/default/activity/dashboard.php
deleted file mode 100644
index 3e0483777..000000000
--- a/mod/activity/views/default/activity/dashboard.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	/// Extract the activity
-	$activity = $vars['activity'];
-	
-	//include a view which can then be extended by the wire plugin so you can post to the wire right in this view
-	echo elgg_view("activity/thewire");
-
-?>
-<div id="activity">
-	<?php
-	if (($activity) && (count($activity)))
-	{
-		foreach ($activity as $a) echo $a;
-	}
-	else
-		echo elgg_echo('activity:noactivity');
-	?>
-</div>
\ No newline at end of file
diff --git a/mod/activity/views/default/activity/offset.php b/mod/activity/views/default/activity/offset.php
deleted file mode 100644
index ad741307a..000000000
--- a/mod/activity/views/default/activity/offset.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php

-	/// Extract the offset value

-	$offset = $vars['offset'];

-	$backset = '-1'; //used to display the forward link

-	$add_to_url = $vars['add_to_url'];//used to determine which pane we are looking at - sitewide, friends, own

-	$url = "pg/activity/";//set the default url

-

-	if($add_to_url == "friends")

-		$url = "pg/activity/" . $_SESSION['user']->username . "/friends/";

-	

-	if($add_to_url == "own")

-		$url = "pg/activity/" . $_SESSION['user']->username;

-

-

-	if($offset > 19)

-		$backset = $offset - 20;//set backset 

-

-	$offset = $offset + 20;//set new offset

-

-	echo "<div class=\"pagination\">";

-

-	echo "<a class=\"back\" href=\"{$vars['url']}{$url}?offset={$offset}\"> &laquo; " . elgg_echo('activity:back') . "</a>";

-	

-	if($backset != '-1')

-		echo "<a class=\"forward\" href=\"{$vars['url']}{$url}?offset={$backset}\">". elgg_echo('activity:forward') . " &raquo;</a>  ";

-

-	echo "<div class=\"clearfloat\"></div></div>";

-	

-?>
\ No newline at end of file
diff --git a/mod/activity/views/default/activity/wrapper.php b/mod/activity/views/default/activity/wrapper.php
deleted file mode 100644
index 685236d01..000000000
--- a/mod/activity/views/default/activity/wrapper.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-	/**
-	 * Elgg activity item wrapper.
-	 * Wraps all river items.
-	 * 
-	 * @package Elgg
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	$statement = $vars['statement'];
-	$time = $vars['time'];
-	$event = $vars['event'];
-	$entry = $vars['entry'];
-	
-	if ($statement->getObject() instanceof ElggEntity) {
-		
-		$obj = $statement->getObject();
-		$subtype = $obj->getSubtype();
-		if (empty($subtype)) $subtype = $obj->type;
-		if (empty($subtype)) $subtype = "general";
-	} else if (is_array($statement->getObject())) {
-		$obj = $statement->getObject();
-		$subtype = "relationship_" . $obj['relationship'];
-	}
-?>
-<div class="activity_item">
-
-	<div class="activity_<?php echo $subtype; ?>">
-		<div class="activity_<?php echo $event; ?>">
-			<p class="activity_<?php echo $subtype; ?>_<?php echo $event; ?>">
-				<?php
-		
-					echo $vars['entry'];
-				
-				?>
-				<span class="activity_item_time">
-					(<?php
-		
-						echo friendly_time($time);
-					
-					?>)
-				</span>
-			</p>
-		</div>
-	</div>
-
-</div>
diff --git a/mod/activity/views/default/settings/activity/edit.php b/mod/activity/views/default/settings/activity/edit.php
deleted file mode 100644
index bfb1a9dbe..000000000
--- a/mod/activity/views/default/settings/activity/edit.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-?>
-<p>
-	<?php echo elgg_echo('activity:useasdashboard'); ?>
-	
-	<select name="params[useasdashboard]">
-		<option value="yes" <?php if ($vars['entity']->useasdashboard == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
-		<option value="no" <?php if ($vars['entity']->useasdashboard != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
-	</select>
-	
-</p>
diff --git a/mod/activity/views/opendd/activity/dashboard.php b/mod/activity/views/opendd/activity/dashboard.php
deleted file mode 100644
index 2fdd7bbf2..000000000
--- a/mod/activity/views/opendd/activity/dashboard.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-	/// Extract the activity
-	$activity = $vars['activity'];
-
-	if (($activity) && (count($activity)))
-	{
-		foreach ($activity as $a) 
-		{
-			foreach ($a as $odd)
-				echo $odd;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/mod/river/languages/en.php b/mod/river/languages/en.php
deleted file mode 100644
index 55bd07746..000000000
--- a/mod/river/languages/en.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-	$english = array(
-	
-		/**
-		 * Manifest
-		 */
-		
-	
-		'river:widget:noactivity' => 'We could not find any activity.',
-		'river:widget:title' => "Activity",
-		'river:widget:description' => "Show your latest activity.",
-		'river:widget:title:friends' => "Friends' activity",
-		'river:widget:description:friends' => "Show what your friends are up to.",
-	
-		'river:widget:label:displaynum' => "Number of entries to display:",
-	);
-					
-	add_translation("en",$english);
-
-?>
\ No newline at end of file
diff --git a/mod/river/manifest.xml b/mod/river/manifest.xml
deleted file mode 100644
index a1bb96cee..000000000
--- a/mod/river/manifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-	<field key="author" value="Curverider ltd" />
-	<field key="version" value="1.0" />
-	<field key="description" value="Provide a list of your or your friends recent activity!" />
-	<field key="website" value="http://www.elgg.org/" />
-	<field key="copyright" value="(C) Curverider 2008-2009" />
-	<field key="licence" value="GNU Public License version 2" />
-</plugin_manifest>
\ No newline at end of file
diff --git a/mod/river/start.php b/mod/river/start.php
deleted file mode 100644
index b9b48a251..000000000
--- a/mod/river/start.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-	/**
-	 * Elgg river plugin.
-	 * This function 
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	/**
-	 * Initialise the river system and add a widget.
-	 */
-	function river_init() 
-	{
-		add_widget_type('river_widget',elgg_echo('river:widget:title'), elgg_echo('river:widget:description'));
-		add_widget_type('river_widget_friends',elgg_echo('river:widget:title:friends'), elgg_echo('river:widget:description:friends'));
-	}
-
-	register_elgg_event_handler('init','system','river_init');
-?>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget/edit.php b/mod/river/views/default/widgets/river_widget/edit.php
deleted file mode 100644
index 3ee93e403..000000000
--- a/mod/river/views/default/widgets/river_widget/edit.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-	/**
-	 * Edit the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-?>
-<p>
-	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
-	
-	<select name="params[limit]">
-		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
-		<option value="8" <?php if ((!$vars['entity']->limit) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
-		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
-		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
-	</select>
-</p>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget/view.php b/mod/river/views/default/widgets/river_widget/view.php
deleted file mode 100644
index 7ef7ea1e1..000000000
--- a/mod/river/views/default/widgets/river_widget/view.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	/**
-	 * View the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	$owner = page_owner_entity();
-	$limit = 8;
-	
-	if ($vars['entity']->limit)
-		$limit = $vars['entity']->limit;
-	echo elgg_view_river($owner->guid, $limit);
-?>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget_friends/edit.php b/mod/river/views/default/widgets/river_widget_friends/edit.php
deleted file mode 100644
index 3ee93e403..000000000
--- a/mod/river/views/default/widgets/river_widget_friends/edit.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-	/**
-	 * Edit the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-?>
-<p>
-	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
-	
-	<select name="params[limit]">
-		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
-		<option value="8" <?php if ((!$vars['entity']->limit) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
-		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
-		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
-	</select>
-</p>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget_friends/view.php b/mod/river/views/default/widgets/river_widget_friends/view.php
deleted file mode 100644
index dd7f580b0..000000000
--- a/mod/river/views/default/widgets/river_widget_friends/view.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	/**
-	 * View the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-
-	$owner = page_owner_entity();
-	$limit = 8;
-	
-	if ($vars['entity']->limit)
-		$limit = $vars['entity']->limit;
-	echo elgg_view_friend_river($owner->guid, $limit);
-?>
\ No newline at end of file