Fixes #2970 updated groups, file, pages, and wire plugins for automatic page owner setting

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

10 files changed, 8 insertions, 35 deletions

diff --git a/mod/file/index.php b/mod/file/index.php
index ad5f4378c..257dd8af8 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -5,8 +5,6 @@
  * @package ElggFile
  */
 
-elgg_set_page_owner_guid(get_input('guid'));
-
 // access check for closed groups
 group_gatekeeper();
 
diff --git a/mod/file/start.php b/mod/file/start.php
index a70267e47..765ef6b01 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -8,7 +8,7 @@
 elgg_register_event_handler('init', 'system', 'file_init');
 
 /**
- * File plugin initialisation functions.
+ * File plugin initialization functions.
  */
 function file_init() {
 
@@ -91,12 +91,9 @@ function file_page_handler($page) {
 	$page_type = $page[0];
 	switch ($page_type) {
 		case 'owner':
-			$owner = get_user_by_username($page[1]);
-			set_input('guid', $owner->guid);
 			include "$file_dir/index.php";
 			break;
 		case 'friends':
-			set_input('username', $page[1]);
 			include "$file_dir/friends.php";
 			break;
 		case 'view':
@@ -104,7 +101,6 @@ function file_page_handler($page) {
 			include "$file_dir/view.php";
 			break;
 		case 'add':
-			set_input('guid', $page[1]);
 			include "$file_dir/upload.php";
 			break;
 		case 'edit':
@@ -112,7 +108,6 @@ function file_page_handler($page) {
 			include "$file_dir/edit.php";
 			break;
 		case 'group':
-			set_input('guid', $page[1]);
 			include "$file_dir/index.php";
 			break;
 		case 'all':
diff --git a/mod/file/upload.php b/mod/file/upload.php
index f26b1bbee..9f0220b95 100644
--- a/mod/file/upload.php
+++ b/mod/file/upload.php
@@ -7,7 +7,6 @@
 
 elgg_load_library('elgg:file');
 
-elgg_set_page_owner_guid(get_input('guid'));
 $owner = elgg_get_page_owner_entity();
 
 gatekeeper();
diff --git a/mod/file/view.php b/mod/file/view.php
index 72660c406..9e89fbd56 100644
--- a/mod/file/view.php
+++ b/mod/file/view.php
@@ -7,12 +7,11 @@
 
 $file = get_entity(get_input('guid'));
 
-elgg_set_page_owner_guid($file->getContainerGUID());
 $owner = elgg_get_page_owner_entity();
 
 elgg_push_breadcrumb(elgg_echo('file'), 'pg/file/all');
 
-$crumbs_title = elgg_echo('blog:owned_blogs', array($owner->name));
+$crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
 	elgg_push_breadcrumb($crumbs_title, "pg/file/group/$owner->guid/owner");
 } else {
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 62b0552e0..6c86ff83f 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -17,7 +17,7 @@ function discussion_handle_all_page() {
 		'annotation_name' => 'generic_comment',
 		'order_by' => 'e.last_action desc',
 		'limit' => 40,
-		'fullview' => false,
+		'full_view' => false,
 	));
 
 	$params = array(
@@ -57,7 +57,7 @@ function discussion_handle_list_page($guid) {
 		'limit' => 20,
 		'order_by' => 'e.last_action desc',
 		'container_guid' => $guid,
-		'fullview' => true,
+		'full_view' => false,
 	);
 	$content = elgg_list_entities($options);
 
@@ -87,7 +87,6 @@ function discussion_handle_edit_page($type, $guid) {
 	gatekeeper();
 
 	if ($type == 'add') {
-		elgg_set_page_owner_guid($guid);
 		$group = get_entity($guid);
 		if (!$group) {
 			register_error(elgg_echo('group:notfound'));
@@ -113,7 +112,6 @@ function discussion_handle_edit_page($type, $guid) {
 			register_error(elgg_echo('group:notfound'));
 			forward();
 		}
-		elgg_set_page_owner_guid($group->getGUID());
 
 		$title = elgg_echo('groups:edittopic');
 
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 96eca34d4..b3fe9560a 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -138,7 +138,7 @@ function groups_submenus() {
 			add_submenu_item(elgg_echo('groups:all'), "pg/groups/world/", 'groupslinks1');
 
 			if ($user = elgg_get_logged_in_user_entity()) {
-				add_submenu_item(elgg_echo('groups:owned'), "pg/groups/owned/$user->username", 'groupslinks1');
+				add_submenu_item(elgg_echo('groups:owned'), "pg/groups/owner/$user->username", 'groupslinks1');
 				add_submenu_item(elgg_echo('groups:yours'), "pg/groups/member/$user->username", 'groupslinks1');
 				add_submenu_item(elgg_echo('groups:invitations'), "pg/groups/invitations/$user->username", 'groupslinks1');
 			}
@@ -151,7 +151,7 @@ function groups_submenus() {
  *
  * URLs take the form of
  *  All groups:           pg/groups/all
- *  User's owned groups:  pg/groups/owned/<username>
+ *  User's owned groups:  pg/groups/owner/<username>
  *  User's member groups: pg/groups/member/<username>
  *  Group profile:        pg/groups/profile/<guid>/<title>
  *  New group:            pg/groups/add/<guid>
@@ -174,8 +174,7 @@ function groups_page_handler($page) {
 		case 'all':
 			groups_handle_all_page();
 			break;
-		case 'owned':
-			set_input('username', $page[1]);
+		case 'owner':
 			groups_handle_owned_page();
 			break;
 		case 'member':
diff --git a/mod/pages/friends.php b/mod/pages/friends.php
index 51c07194f..d851edea3 100644
--- a/mod/pages/friends.php
+++ b/mod/pages/friends.php
@@ -5,9 +5,6 @@
  * @package ElggPages
  */
 
-$guid = get_input('guid');
-
-elgg_set_page_owner_guid($guid);
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
 
diff --git a/mod/pages/index.php b/mod/pages/index.php
index ff5a78311..6a89e6092 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -5,9 +5,6 @@
  * @package ElggPages
  */
 
-$guid = get_input('guid');
-
-elgg_set_page_owner_guid($guid);
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
 
diff --git a/mod/pages/start.php b/mod/pages/start.php
index ec5a8815b..5c9b4bdc7 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -113,12 +113,9 @@ function pages_page_handler($page) {
 	$page_type = $page[0];
 	switch ($page_type) {
 		case 'owner':
-			$owner = get_user_by_username($page[1]);
-			set_input('guid', $owner->guid);
 			include "$base_dir/index.php";
 			break;
 		case 'friends':
-			set_input('username', $page[1]);
 			include "$base_dir/friends.php";
 			break;
 		case 'view':
@@ -134,7 +131,6 @@ function pages_page_handler($page) {
 			include "$base_dir/edit.php";
 			break;
 		case 'group':
-			set_input('guid', $page[1]);
 			include "$base_dir/index.php";
 			break;
 		case 'history':
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 7450ea78a..12e4b0884 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -8,6 +8,7 @@
  * Cash Costello

  * Clark Updike

  * John Norton

+ * Max Thomas

  * Nathan Koterba

  */

 

@@ -79,16 +80,10 @@ function thewire_page_handler($page) {
 				break;

 

 			case "friends":

-				if (isset($page[1])) {

-					set_input('username', $page[1]);

-				}

 				include dirname(__FILE__) . "/pages/friends.php";

 				break;

 

 			case "owner":

-				if (isset($page[1])) {

-					set_input('username', $page[1]);

-				}

 				include dirname(__FILE__) . "/pages/user.php";

 				break;