From c27eac2d2a970e76a1204757bbe15da8efb2870c Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 30 Oct 2010 21:48:24 +0000 Subject: Refs #1439: Using new page_owner functions in all of core git-svn-id: http://code.elgg.org/elgg/trunk@7140 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/group.php | 6 +++--- engine/lib/users.php | 10 +++++----- engine/lib/views.php | 2 +- mod/blog/views/default/blog/sidebar_menu.php | 4 ++-- mod/bookmarks/bookmarklet.php | 2 +- mod/bookmarks/start.php | 12 ++++++------ mod/bookmarks/views/default/bookmarks/bookmarklet.php | 2 +- mod/bookmarks/views/default/bookmarks/form.php | 6 +++--- mod/bookmarks/views/default/bookmarks/group_bookmarks.php | 6 +++--- mod/bookmarks/views/default/widgets/bookmarks/view.php | 2 +- mod/defaultwidgets/views/default/defaultwidgets/editor.php | 4 ++-- mod/file/edit.php | 2 +- mod/file/friends.php | 2 +- mod/file/index.php | 8 ++++---- mod/file/search.php | 4 ++-- mod/file/start.php | 2 +- mod/file/upload.php | 2 +- mod/file/views/default/file/groupprofile_files.php | 2 +- mod/file/views/default/file/typecloud.php | 2 +- mod/file/views/default/file/upload.php | 2 +- mod/file/world.php | 2 +- mod/groups/activity.php | 4 ++-- mod/groups/addtopic.php | 2 +- mod/groups/all.php | 2 +- mod/groups/edittopic.php | 2 +- mod/groups/forum.php | 2 +- mod/groups/index.php | 2 +- mod/groups/membership.php | 2 +- mod/groups/start.php | 4 ++-- mod/groups/topicposts.php | 2 +- mod/groups/views/default/forum/maintopic.php | 2 +- mod/groups/views/default/forum/topics.php | 2 +- mod/groups/views/default/forum/viewposts.php | 2 +- mod/groups/views/default/groups/activity_latest.php | 4 ++-- mod/groups/views/default/groups/forum_latest.php | 6 +++--- mod/groups/views/default/object/groupforumtopic.php | 2 +- mod/members/index.php | 6 +++--- mod/messageboard/index.php | 2 +- mod/messageboard/views/default/messageboard/forms/add.php | 2 +- .../views/default/widgets/messageboard/view.php | 4 ++-- mod/messages/send.php | 2 +- mod/pages/edit.php | 2 +- mod/pages/history.php | 2 +- mod/pages/index.php | 8 ++++---- mod/pages/new.php | 4 ++-- mod/pages/start.php | 6 +++--- mod/pages/view.php | 6 +++--- mod/pages/views/default/forms/pages/edit.php | 4 ++-- mod/pages/views/default/pages/groupprofile_pages.php | 2 +- mod/pages/views/default/widgets/pages/view.php | 4 ++-- mod/pages/welcome.php | 4 ++-- mod/pages/world.php | 6 +++--- mod/profile/edit.php | 2 +- mod/profile/editicon.php | 2 +- mod/profile/icon.php | 2 +- mod/profile/start.php | 2 +- mod/profile/views/default/profile/admin_menu.php | 4 ++-- .../views/default/profile/commentwall/commentwalladd.php | 2 +- mod/profile/views/default/profile/edit.php | 4 ++-- mod/profile/views/default/profile/listing.php | 4 ++-- mod/profile/views/default/profile/metatags.php | 2 +- .../views/default/profile/profile_contents/details.php | 4 ++-- mod/profile/views/default/profile/profile_ownerblock.php | 4 ++-- mod/reportedcontent/add.php | 2 +- mod/tagcloud/views/default/widgets/tagcloud/view.php | 2 +- mod/thewire/index.php | 4 ++-- mod/thewire/start.php | 2 +- mod/thewire/views/default/widgets/thewire/view.php | 2 +- pages/friends/index.php | 4 ++-- pages/friends/of.php | 4 ++-- pages/friends/pickercallback.php | 2 +- pages/settings/index.php | 6 +++--- pages/settings/plugins.php | 2 +- pages/settings/statistics.php | 2 +- pages/settings/user.php | 2 +- views/default/canvas/layouts/widgets.php | 14 +++++++------- views/default/notifications/settings/usersettings.php | 2 +- views/default/page_elements/content_header.php | 2 +- views/default/page_elements/content_header_member.php | 4 ++-- views/default/page_elements/owner_block.php | 2 +- views/default/page_elements/title.php | 2 +- views/default/user/settings/default_access.php | 2 +- views/default/user/settings/email.php | 2 +- views/default/user/settings/language.php | 2 +- views/default/user/settings/name.php | 2 +- views/default/user/settings/password.php | 2 +- views/default/widgets/editwrapper.php | 2 +- views/default/widgets/wrapper.php | 2 +- views/foaf/page_shells/default.php | 2 +- 89 files changed, 148 insertions(+), 148 deletions(-) diff --git a/engine/lib/group.php b/engine/lib/group.php index 8c68e0aca..ed7aa504a 100644 --- a/engine/lib/group.php +++ b/engine/lib/group.php @@ -201,7 +201,7 @@ $order_by = "", $limit = 10, $offset = 0, $count = FALSE) { $container_guid = (int)$group_guid; if ($container_guid == 0) { - $container_guid = page_owner(); + $container_guid = elgg_get_page_owner_guid(); } $where = array(); @@ -309,7 +309,7 @@ $order_by = "", $site_guid = 0, $count = false) { $container_guid = (int)$group_guid; if ($container_guid == 0) { - $container_guid = page_owner(); + $container_guid = elgg_get_page_owner_guid(); } $where = array(); @@ -583,7 +583,7 @@ function group_gatekeeper($forward = true) { $allowed = true; $url = ''; - if ($group = page_owner_entity()) { + if ($group = elgg_get_page_owner()) { if ($group instanceof ElggGroup) { $url = $group->getURL(); if ( diff --git a/engine/lib/users.php b/engine/lib/users.php index e980ee6f8..6c6e51d4d 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1243,7 +1243,7 @@ function friends_page_handler($page_elements) { if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) { set_page_owner($user->getGUID()); } - if (get_loggedin_userid() == page_owner()) { + if (get_loggedin_userid() == elgg_get_page_owner_guid()) { // disabled for now as we no longer use friends collections (replaced by shared access) // collections_submenu_items(); } @@ -1261,7 +1261,7 @@ function friends_of_page_handler($page_elements) { if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) { set_page_owner($user->getGUID()); } - if (get_loggedin_userid() == page_owner()) { + if (get_loggedin_userid() == elgg_get_page_owner_guid()) { // disabled for now as we no longer use friends collections (replaced by shared access) // collections_submenu_items(); } @@ -1284,7 +1284,7 @@ function collections_page_handler($page_elements) { } else { if ($user = get_user_by_username($page_elements[0])) { set_page_owner($user->getGUID()); - if (get_loggedin_userid() == page_owner()) { + if (get_loggedin_userid() == elgg_get_page_owner_guid()) { collections_submenu_items(); } require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/collections.php"); @@ -1401,10 +1401,10 @@ function users_pagesetup() { // || get_context() == "collections") { - disabled as we no longer use collections add_submenu_item(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" - . page_owner_entity()->username); + . elgg_get_page_owner()->username); add_submenu_item(elgg_echo('friends:of'), $CONFIG->wwwroot . "pg/friendsof/" - . page_owner_entity()->username); + . elgg_get_page_owner()->username); if (is_plugin_enabled('members')) { add_submenu_item(elgg_echo('members:browse'), $CONFIG->wwwroot . "mod/members/index.php"); diff --git a/engine/lib/views.php b/engine/lib/views.php index 755fa9da2..d8564c5e3 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -283,7 +283,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie // Load page owner variables into $vars if (is_callable('page_owner')) { - $vars['page_owner'] = page_owner(); + $vars['page_owner'] = elgg_get_page_owner_guid(); } else { $vars['page_owner'] = -1; } diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php index ffa8d1bd4..ab00433c8 100644 --- a/mod/blog/views/default/blog/sidebar_menu.php +++ b/mod/blog/views/default/blog/sidebar_menu.php @@ -22,7 +22,7 @@ Owned blogs; */ $loggedin_user = get_loggedin_user(); -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); // include a view for plugins to extend echo elgg_view("blogs/sidebar", array("object_type" => 'blog')); @@ -46,7 +46,7 @@ if ($page_owner) { $timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4)); if (!isset($page_owner)) { - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); } $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh; diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php index e1ff3c6df..ecfe61ae5 100644 --- a/mod/bookmarks/bookmarklet.php +++ b/mod/bookmarks/bookmarklet.php @@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); gatekeeper(); // Get the current page's owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 3d748fabe..25b87b6c7 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -53,7 +53,7 @@ function bookmarks_init() { function bookmarks_pagesetup() { global $CONFIG; - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); // Add group bookmark menu item if (isloggedin()) { @@ -79,13 +79,13 @@ function bookmarks_page_handler($page) { // The first component of a bookmarks URL is the username // If the username is set_input()'d and has group:NN in it, magic happens - // and the page_owner_entity() is the group. + // and the elgg_get_page_owner() is the group. if (isset($page[0])) { $owner_name = $page[0]; set_input('username', $owner_name); // grab the page owner here so the group magic works. - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); } else { set_page_owner(get_loggedin_userid()); } @@ -96,7 +96,7 @@ function bookmarks_page_handler($page) { $content = elgg_echo("bookmarks:unknown_user"); $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar); - echo page_draw(sprintf(elgg_echo("bookmarks:user"), page_owner_entity()->name), $body); + echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body); return FALSE; } @@ -105,7 +105,7 @@ function bookmarks_page_handler($page) { $section = (isset($page[1])) ? $page[1] : $section = 'items'; //don't show the all site bookmarks breadcrumb when on the all site bookmarks page - if(page_owner() != 0){ + if(elgg_get_page_owner_guid() != 0){ elgg_push_breadcrumb(elgg_echo('bookmarks:all'), $CONFIG->wwwroot . 'pg/bookmarks/'); } @@ -240,7 +240,7 @@ function bookmarks_page_handler($page) { $content = $header . $content; $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar); - echo page_draw(sprintf(elgg_echo("bookmarks:user"), page_owner_entity()->name), $body); + echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body); return TRUE; } diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php index 5205632f2..38ef95152 100644 --- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php +++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php @@ -5,7 +5,7 @@ * @package ElggBookmarks */ -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); $bookmarktext = elgg_echo("bookmarks:this"); if ($page_owner instanceof ElggGroup) { diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php index b779116fd..deef1f7af 100644 --- a/mod/bookmarks/views/default/bookmarks/form.php +++ b/mod/bookmarks/views/default/bookmarks/form.php @@ -25,9 +25,9 @@ if(isset($vars['entity'])){ if ($address == "previous") $address = $_SERVER['HTTP_REFERER']; $tags = array(); - if(page_owner_entity() instanceof ElggGroup){ + if(elgg_get_page_owner() instanceof ElggGroup){ //if in a group, set the access level to default to the group - $access_id = page_owner_entity()->group_acl; + $access_id = elgg_get_page_owner()->group_acl; }else{ $access_id = get_default_access(get_loggedin_user()); } @@ -89,7 +89,7 @@ if(isset($vars['entity'])){ 'access', 'value' => $access_id, diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php index 652743b7b..b476e8cf2 100755 --- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php +++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php @@ -2,10 +2,10 @@ //grab the groups bookmarks $bookmarks = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks', - 'container_guids' => page_owner(), 'limit' => 6)); + 'container_guids' => elgg_get_page_owner_guid(), 'limit' => 6)); ?>
-username; ?>"> +username; ?>">

" . $info . "
"; } } else { - $create_bookmark = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username . "/add"; + $create_bookmark = $vars['url'] . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add"; echo "

" . elgg_echo("bookmarks:new") . "

"; } echo ""; \ No newline at end of file diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php index 37d4ce3a4..1504ec8b4 100644 --- a/mod/bookmarks/views/default/widgets/bookmarks/view.php +++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php @@ -43,7 +43,7 @@ if($bookmarks){ } - $user_inbox = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username; + $user_inbox = $vars['url'] . "pg/bookmarks/" . elgg_get_page_owner()->username; if (get_entities('object', 'bookmarks', $vars['entity']->container_guid, '', '', '', true) > $num) echo "
".elgg_echo('bookmarks:read')."
"; diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php index bdcbd1f9a..6a3756d13 100644 --- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php +++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php @@ -11,7 +11,7 @@ **/ // set some defaults - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); $context = $vars['context']; $area1widgets = false; $area2widgets = false; @@ -261,7 +261,7 @@ $(document).ready(function () { echo elgg_view('input/hidden',array('internalname' => '__elgg_ts', 'value' => $vars['ts'])); ?> - + diff --git a/mod/file/edit.php b/mod/file/edit.php index 6c7dbd092..8d091caa0 100644 --- a/mod/file/edit.php +++ b/mod/file/edit.php @@ -18,7 +18,7 @@ if (!$file) { } // Set the page owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if (!$page_owner) { $container_guid = $file->container_guid; if ($container_guid) { diff --git a/mod/file/friends.php b/mod/file/friends.php index d7d47acf7..984aedc60 100644 --- a/mod/file/friends.php +++ b/mod/file/friends.php @@ -11,7 +11,7 @@ group_gatekeeper(); } - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); $title = sprintf(elgg_echo("file:friends"),$owner->name); $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); diff --git a/mod/file/index.php b/mod/file/index.php index 9c2745f1b..28ec07031 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -14,20 +14,20 @@ group_gatekeeper(); //set the title - if (page_owner() == get_loggedin_userid()) { + if (elgg_get_page_owner_guid() == get_loggedin_userid()) { $title = elgg_echo('file:yours'); $area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file')); } else { - $title = sprintf(elgg_echo("file:user"),page_owner_entity()->name); + $title = sprintf(elgg_echo("file:user"),elgg_get_page_owner()->name); $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); } // Get objects set_context('search'); $offset = (int)get_input('offset', 0); - $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE)); + $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE)); set_context('file'); - $get_filter = get_filetype_cloud(page_owner()); + $get_filter = get_filetype_cloud(elgg_get_page_owner_guid()); if ($get_filter) { $area1 .= $get_filter; } else { diff --git a/mod/file/search.php b/mod/file/search.php index 1b646f361..9279129a8 100644 --- a/mod/file/search.php +++ b/mod/file/search.php @@ -53,8 +53,8 @@ if (is_array($owner_guid)) { //$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag)); $area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); - } else if (page_owner() && page_owner() != $_SESSION['guid']) { - //$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),page_owner_entity()->name)); + } else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != $_SESSION['guid']) { + //$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),elgg_get_page_owner()->name)); $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file')); } else{ //$area2 = elgg_view_title(elgg_echo("file:type:" . $tag)); diff --git a/mod/file/start.php b/mod/file/start.php index 1910b26b8..60e863df5 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -74,7 +74,7 @@ global $CONFIG; - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); // Group submenu option if ($page_owner instanceof ElggGroup && get_context() == "groups") { diff --git a/mod/file/upload.php b/mod/file/upload.php index 6f9d3d750..a4cd4e01e 100644 --- a/mod/file/upload.php +++ b/mod/file/upload.php @@ -14,7 +14,7 @@ // Render the file upload page - $container_guid = page_owner(); + $container_guid = elgg_get_page_owner_guid(); $area1 = elgg_view_title($title = elgg_echo('file:upload')); $area1 .= elgg_view("file/upload", array('container_guid' => $container_guid)); $body = elgg_view_layout('one_column_with_sidebar', $area1); diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php index 312a5c5cf..f520f0d2e 100644 --- a/mod/file/views/default/file/groupprofile_files.php +++ b/mod/file/views/default/file/groupprofile_files.php @@ -41,7 +41,7 @@ //get a link to the users files - $users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username; + $users_file_url = $vars['url'] . "pg/file/" . elgg_get_page_owner()->username; echo "

" . elgg_echo('file:more') . "

"; diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php index 5ac831cfe..e404327ae 100644 --- a/mod/file/views/default/file/typecloud.php +++ b/mod/file/views/default/file/typecloud.php @@ -37,7 +37,7 @@ if ($tag == "image") $url .= "&search_viewtype=gallery"; - $url .= "&page_owner=" . page_owner(); + $url .= "&page_owner=" . elgg_get_page_owner_guid(); $inputtag = get_input('tag'); if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) { diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php index 0a94589e5..f89cf86d3 100644 --- a/mod/file/views/default/file/upload.php +++ b/mod/file/views/default/file/upload.php @@ -27,7 +27,7 @@ $access_id = 0; } $access_id = isset($_SESSION['uploadaccessid']) ? $_SESSION['uploadaccessid'] : $access_id; - $container_guid = page_owner_entity()->guid; + $container_guid = elgg_get_page_owner_guid(); } // make sure session cache is cleared diff --git a/mod/file/world.php b/mod/file/world.php index 21e741184..2bc24bd66 100644 --- a/mod/file/world.php +++ b/mod/file/world.php @@ -11,7 +11,7 @@ $offset = get_input("offset", 0); // Get the current page's owner - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($_SESSION['guid']); diff --git a/mod/groups/activity.php b/mod/groups/activity.php index 9081dbe8d..38d94fa4e 100644 --- a/mod/groups/activity.php +++ b/mod/groups/activity.php @@ -7,7 +7,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); $group_guid = (int)get_input('group'); set_page_owner($group_guid); -if (!(page_owner_entity() instanceof ElggGroup)) { +if (!(elgg_get_page_owner() instanceof ElggGroup)) { forward(); } group_gatekeeper(); @@ -50,7 +50,7 @@ if (count($entity_guids) > 0) { $area1 .= elgg_view_title(elgg_echo('groups:activity')); $area1 .= elgg_view("group_activity/extend"); $area1 .= "
".$river_items."
"; -$title = sprintf(elgg_echo("groups:activity"), page_owner_entity()->name); +$title = sprintf(elgg_echo("groups:activity"), elgg_get_page_owner()->name); $body = elgg_view_layout('one_column_with_sidebar', $area1); // Finally draw the page diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php index cc02fa4eb..8d62bf19f 100644 --- a/mod/groups/addtopic.php +++ b/mod/groups/addtopic.php @@ -10,7 +10,7 @@ group_gatekeeper(); $page_owner = set_page_owner((int) get_input('group_guid')); -if (!(page_owner_entity() instanceof ElggGroup)) forward(); +if (!(elgg_get_page_owner() instanceof ElggGroup)) forward(); // sort the display $area2 = elgg_view("forms/forums/addtopic"); diff --git a/mod/groups/all.php b/mod/groups/all.php index dda000f95..c51097910 100644 --- a/mod/groups/all.php +++ b/mod/groups/all.php @@ -54,7 +54,7 @@ $objects = "
".$objects."
"; - $title = sprintf(elgg_echo("groups:all"), page_owner_entity()->name); + $title = sprintf(elgg_echo("groups:all"), elgg_get_page_owner()->name); if(isloggedin()){ $area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "{$CONFIG->url}pg/groups/new")); } diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php index b09efacbe..2c457f53b 100644 --- a/mod/groups/edittopic.php +++ b/mod/groups/edittopic.php @@ -12,7 +12,7 @@ get_input('group'); $page_owner = set_page_owner((int)get_input('group')); // check the user is a member of the group -if (!(page_owner_entity() instanceof ElggGroup)) forward(); +if (!(elgg_get_page_owner() instanceof ElggGroup)) forward(); //get the topic $topic = get_entity((int) get_input('topic')); diff --git a/mod/groups/forum.php b/mod/groups/forum.php index c06bb2ebb..a6b88f9fb 100644 --- a/mod/groups/forum.php +++ b/mod/groups/forum.php @@ -7,7 +7,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); $group_guid = (int)get_input('group_guid'); set_page_owner($group_guid); -if (!(page_owner_entity() instanceof ElggGroup)) { +if (!(elgg_get_page_owner() instanceof ElggGroup)) { forward(); } diff --git a/mod/groups/index.php b/mod/groups/index.php index a06c67f73..398996072 100644 --- a/mod/groups/index.php +++ b/mod/groups/index.php @@ -16,7 +16,7 @@ $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "{$CONFIG->url}pg/groups/new")); set_context('search'); - $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); + $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); set_context('groups'); $area1 .= $objects; diff --git a/mod/groups/membership.php b/mod/groups/membership.php index 0085033fa..b479018ca 100644 --- a/mod/groups/membership.php +++ b/mod/groups/membership.php @@ -14,7 +14,7 @@ $limit = get_input("limit", 10); $offset = get_input("offset", 0); - if (page_owner() == get_loggedin_userid()) { + if (elgg_get_page_owner_guid() == get_loggedin_userid()) { $title = elgg_echo("groups:yours"); } else $title = elgg_echo("groups:owned"); diff --git a/mod/groups/start.php b/mod/groups/start.php index 689e24863..b81ae81ce 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -200,7 +200,7 @@ global $CONFIG; // Get the page owner entity - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); if (get_context() == 'groups') { if ($page_owner instanceof ElggGroup) { @@ -399,7 +399,7 @@ */ function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params) { - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); if (!$loggedin = get_loggedin_user()) { return $returnvalue; } diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php index afd916ad2..d3ba05ead 100644 --- a/mod/groups/topicposts.php +++ b/mod/groups/topicposts.php @@ -15,7 +15,7 @@ //get_input('group_guid'); set_page_owner(get_input('group_guid')); - if (!(page_owner_entity() instanceof ElggGroup)) forward(); + if (!(elgg_get_page_owner() instanceof ElggGroup)) forward(); group_gatekeeper(); diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index 3eb124395..03e628846 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -23,7 +23,7 @@ // display the user name echo "
"; // if comment owner, group owner, or site admin - display edit and delete options - if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { + if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) { echo "
"; echo "".elgg_view("output/confirmlink",array( 'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'), diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index d5e533f81..5c1f5a099 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -9,7 +9,7 @@

isMember(get_loggedin_user())) { + if(elgg_get_page_owner()->isMember(get_loggedin_user())) { ?>
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php index f0810ba18..407869314 100644 --- a/mod/groups/views/default/forum/viewposts.php +++ b/mod/groups/views/default/forum/viewposts.php @@ -39,7 +39,7 @@ echo elgg_view('navigation/pagination',array( echo "

" . elgg_echo("groups:topicisclosed") . "

"; echo "

" . elgg_echo("groups:topiccloseddesc") . "

"; - }elseif(page_owner_entity()->isMember(get_loggedin_user())){ + }elseif(elgg_get_page_owner()->isMember(get_loggedin_user())){ //comments are on and the user viewing is a member echo elgg_view_comments($vars['entity']); }else{ diff --git a/mod/groups/views/default/groups/activity_latest.php b/mod/groups/views/default/groups/activity_latest.php index 4947cfc0b..ea16964c3 100644 --- a/mod/groups/views/default/groups/activity_latest.php +++ b/mod/groups/views/default/groups/activity_latest.php @@ -5,10 +5,10 @@ * @package Groups */ ?> -"> +">

guid; $limit = 5; diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php index 2a9ddaf42..b84a224ab 100644 --- a/mod/groups/views/default/groups/forum_latest.php +++ b/mod/groups/views/default/groups/forum_latest.php @@ -5,7 +5,7 @@ //check to make sure this group forum has been activated if($vars['entity']->forum_enable != 'no'){ ?> -"> +">

forum_enable != 'no'){ echo "
"; } } else { - if(page_owner_entity()->isMember(get_loggedin_user())){ - $create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . page_owner(); + if(elgg_get_page_owner()->isMember(get_loggedin_user())){ + $create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid(); echo "

".elgg_echo("groups:addtopic")."

"; }else{ echo "

". elgg_echo("grouptopic:notcreated") . "

"; diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 74a66c6d7..2fdf24723 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -49,7 +49,7 @@ if (get_context() == "search") { } $info .= "

" . elgg_echo('groups:started') . " " . $topic_owner->name . ": guid}&group_guid={$group->guid}\">{$title}

"; - if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { + if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) { // display the delete link to those allowed to delete $info .= "
"; $info .= '' . elgg_view("output/url", array( diff --git a/mod/members/index.php b/mod/members/index.php index 30d6102e3..4bcdef0fd 100644 --- a/mod/members/index.php +++ b/mod/members/index.php @@ -8,7 +8,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Get the current page's owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); //set_page_owner($page_owner->getGUID()); @@ -23,8 +23,8 @@ $filter = get_input("filter", "newest"); $tag = get_input('tag'); // friends links -$area1 = "
  • wwwroot."pg/friends/" . page_owner_entity()->username . "\">". elgg_echo('friends') . "
    • "; -$area1 .= "
  • wwwroot."pg/friendsof/" . page_owner_entity()->username . "\">". elgg_echo('friends:of') . "
    • "; +$area1 = ""; diff --git a/mod/messageboard/index.php b/mod/messageboard/index.php index 88438bb85..ff661ce9c 100644 --- a/mod/messageboard/index.php +++ b/mod/messageboard/index.php @@ -11,7 +11,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Get the user who is the owner of the message board -$entity = get_entity(page_owner()); +$entity = elgg_get_page_owner(); // Get any annotations for their message board $contents = $entity->getAnnotations('messageboard', 50, 0, 'desc'); diff --git a/mod/messageboard/views/default/messageboard/forms/add.php b/mod/messageboard/views/default/messageboard/forms/add.php index b26527b06..ec61ebee7 100644 --- a/mod/messageboard/views/default/messageboard/forms/add.php +++ b/mod/messageboard/views/default/messageboard/forms/add.php @@ -14,7 +14,7 @@
    - + diff --git a/mod/messageboard/views/default/widgets/messageboard/view.php b/mod/messageboard/views/default/widgets/messageboard/view.php index dde360961..223cbc007 100644 --- a/mod/messageboard/views/default/widgets/messageboard/view.php +++ b/mod/messageboard/views/default/widgets/messageboard/view.php @@ -8,7 +8,7 @@ */ //get the full page owner entity -$user = get_entity(page_owner()); +$user = elgg_get_page_owner(); //the number of message to display $num_display = 5; @@ -46,7 +46,7 @@ if (isloggedin()) { - + diff --git a/mod/messages/send.php b/mod/messages/send.php index 0435974ce..c0a59b289 100644 --- a/mod/messages/send.php +++ b/mod/messages/send.php @@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); gatekeeper(); // Get the current page's owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); diff --git a/mod/pages/edit.php b/mod/pages/edit.php index cc9955bc9..30207a7b9 100644 --- a/mod/pages/edit.php +++ b/mod/pages/edit.php @@ -15,7 +15,7 @@ if ($container = $pages->container_guid) { set_page_owner($container); } -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); diff --git a/mod/pages/history.php b/mod/pages/history.php index 06e877c42..dfbe3ab59 100644 --- a/mod/pages/history.php +++ b/mod/pages/history.php @@ -25,7 +25,7 @@ $offset = (int)get_input('offset'); $page_guid = get_input('page_guid'); $pages = get_entity($page_guid); -add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); +add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); $title = $pages->title . ": " . elgg_echo("pages:history"); $content = elgg_view_title($title); diff --git a/mod/pages/index.php b/mod/pages/index.php index 2afae36df..50d11af1d 100644 --- a/mod/pages/index.php +++ b/mod/pages/index.php @@ -10,13 +10,13 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); global $CONFIG; // Add menus -$owner = page_owner_entity(); +$owner = elgg_get_page_owner(); if (!($owner instanceof ElggGroup)) { - add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); + add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral'); } if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){ - add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions'); + add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . elgg_get_page_owner_guid(), 'pagesactions'); add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/" . $owner->username, 'pagesactions'); } @@ -38,7 +38,7 @@ $context = get_context(); set_context('search'); -$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); +$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); set_context($context); diff --git a/mod/pages/new.php b/mod/pages/new.php index bf2640301..2003b183e 100644 --- a/mod/pages/new.php +++ b/mod/pages/new.php @@ -13,7 +13,7 @@ global $CONFIG; if ($container = (int) get_input('container_guid')) { set_page_owner($container); } -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); @@ -28,7 +28,7 @@ if(get_input('parent_guid')){ } global $CONFIG; -add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); +add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); $title = elgg_echo("pages:new"); $area2 .= elgg_view_title($title); diff --git a/mod/pages/start.php b/mod/pages/start.php index 80c1607a2..3dcacd457 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -82,7 +82,7 @@ function pages_submenus() { global $CONFIG; - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); // Group submenu option if ($page_owner instanceof ElggGroup && get_context() == 'groups') { @@ -310,8 +310,8 @@ function pages_write_permission_check($hook, $entity_type, $returnvalue, $params function pages_container_permission_check($hook, $entity_type, $returnvalue, $params) { if (get_context() == "pages") { - if (page_owner()) { - if (can_write_to_container(get_loggedin_userid(), page_owner())) return true; + if (elgg_get_page_owner_guid()) { + if (can_write_to_container(get_loggedin_userid(), elgg_get_page_owner_guid())) return true; } if ($page_guid = get_input('page_guid',0)) { $entity = get_entity($page_guid); diff --git a/mod/pages/view.php b/mod/pages/view.php index 2efcf4f04..24684bff7 100644 --- a/mod/pages/view.php +++ b/mod/pages/view.php @@ -28,10 +28,10 @@ if ($container) { } global $CONFIG; -// add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); +// add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); if ($pages->canEdit()) { - add_submenu_item(elgg_echo('pages:newchild'),"{$CONFIG->wwwroot}pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . page_owner(), 'pagesactions'); + add_submenu_item(elgg_echo('pages:newchild'),"{$CONFIG->wwwroot}pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions'); $delete_url = elgg_add_action_tokens_to_url("{$CONFIG->wwwroot}action/pages/delete?page={$pages->getGUID()}"); add_submenu_item(elgg_echo('pages:delete'), $delete_url, 'pagesactions', true); } @@ -44,7 +44,7 @@ if ($parent_page = get_entity(get_input("page_guid"))) { $title = $pages->title; // Breadcrumbs -$body = elgg_view('pages/breadcrumbs', array('page_owner' => page_owner_entity(), 'parent' => $parent)); +$body = elgg_view('pages/breadcrumbs', array('page_owner' => elgg_get_page_owner(), 'parent' => $parent)); $body .= elgg_view_title($pages->title); $body .= elgg_view_entity($pages, true); diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index bdd721b82..0d066bf80 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -8,7 +8,7 @@ $parent_guid = get_input('parent_guid'); $container_guid = get_input('container_guid'); if (!$container_guid) { - $container_guid = page_owner(); + $container_guid = elgg_get_page_owner_guid(); } $new_page = false; @@ -86,7 +86,7 @@ if ($container_guid) { } ?> - + " />

    diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php index 17c1d87ed..8069cdd8b 100644 --- a/mod/pages/views/default/pages/groupprofile_pages.php +++ b/mod/pages/views/default/pages/groupprofile_pages.php @@ -13,7 +13,7 @@ if ($vars['entity']->pages_enable != 'no') {

    'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE)); + $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => 5, 'full_view' => FALSE)); if($objects) echo $objects; diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php index 9d5a89aea..d51fd008a 100644 --- a/mod/pages/views/default/widgets/pages/view.php +++ b/mod/pages/views/default/widgets/pages/view.php @@ -17,10 +17,10 @@ if (!$num_display) { $num_display = 4; } -$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE)); +$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $num_display, 'full_view' => FALSE)); if ($pages) { - $pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username; + $pagesurl = $vars['url'] . "pg/pages/owned/" . elgg_get_page_owner()->username; $pages .= "
    " . elgg_echo('pages:more') . "
    "; } diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php index 10628b175..759114965 100644 --- a/mod/pages/welcome.php +++ b/mod/pages/welcome.php @@ -15,7 +15,7 @@ if ($container = (int) get_input('container_guid')) { set_page_owner($container); } -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); @@ -24,7 +24,7 @@ if ($page_owner === false || is_null($page_owner)) { //get the owners welcome message if it exists $welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $page_owner->getGUID(), 'limit' => 1)); global $CONFIG; -add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); +add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); $title = elgg_echo("pages:welcome"); $area2 .= elgg_view_title($title); diff --git a/mod/pages/world.php b/mod/pages/world.php index 8a8ede68d..0b411b8b2 100644 --- a/mod/pages/world.php +++ b/mod/pages/world.php @@ -10,7 +10,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); global $CONFIG; // Get the current page's owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($_SESSION['guid']); @@ -21,7 +21,7 @@ if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())) } if(isloggedin()) { - add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral'); + add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral'); } add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral'); @@ -29,7 +29,7 @@ add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", $limit = get_input("limit", 10); $offset = get_input("offset", 0); -$title = sprintf(elgg_echo("pages:all"),page_owner_entity()->name); +$title = sprintf(elgg_echo("pages:all"),elgg_get_page_owner()->name); // Get objects $context = get_context(); diff --git a/mod/profile/edit.php b/mod/profile/edit.php index 2b09c7ff8..97b656a5c 100644 --- a/mod/profile/edit.php +++ b/mod/profile/edit.php @@ -15,7 +15,7 @@ if (!isloggedin()) { } // Get owner of profile - set in page handler -$user = page_owner_entity(); +$user = elgg_get_page_owner(); if (!$user) { register_error(elgg_echo("profile:notfound")); forward(); diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php index 2b1a40d0f..9b0a654d2 100644 --- a/mod/profile/editicon.php +++ b/mod/profile/editicon.php @@ -14,7 +14,7 @@ if (!isloggedin()) { } // Get owner of profile - set in page handler -$user = page_owner_entity(); +$user = elgg_get_page_owner(); if (!$user) { register_error(elgg_echo("profile:notfound")); forward(); diff --git a/mod/profile/icon.php b/mod/profile/icon.php index b7b4f921c..48ccc16c2 100644 --- a/mod/profile/icon.php +++ b/mod/profile/icon.php @@ -8,7 +8,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Get the owning user -$user = page_owner_entity(); +$user = elgg_get_page_owner(); // Get the size $size = strtolower(get_input('size')); diff --git a/mod/profile/start.php b/mod/profile/start.php index 48547c0bf..d1840babb 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -174,7 +174,7 @@ function profile_pagesetup() //add submenu options if (get_context() == "profile") { - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); if ($page_owner && $page_owner->canEdit()) { add_submenu_item(elgg_echo('profile:editdetails'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/details"); add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/icon"); diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php index a33910309..a896a0ace 100755 --- a/mod/profile/views/default/profile/admin_menu.php +++ b/mod/profile/views/default/profile/admin_menu.php @@ -5,8 +5,8 @@ global $CONFIG; if (isadminloggedin()){ - if ($_SESSION['id']!=page_owner()){ - $user = get_user(page_owner()); + if ($_SESSION['id']!=elgg_get_page_owner_guid()){ + $user = get_user(elgg_get_page_owner_guid()); $url = $vars['url']; $ts = time(); $token = generate_action_token($ts); diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php index f5bd1bdce..0491925c6 100644 --- a/mod/profile/views/default/profile/commentwall/commentwalladd.php +++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php @@ -10,7 +10,7 @@ - + diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 045436da4..310536527 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -14,7 +14,7 @@

    'name', 'value' => page_owner_entity()->name)); + echo elgg_view('input/text',array('internalname' => 'name', 'value' => elgg_get_page_owner()->name)); ?>

    @@ -73,7 +73,7 @@ ?>

    - + " />

    diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php index 404d123c8..6dc8e0948 100644 --- a/mod/profile/views/default/profile/listing.php +++ b/mod/profile/views/default/profile/listing.php @@ -18,9 +18,9 @@ $banned = $vars['entity']->isBanned(); // Simple XFN $rel = ""; -if (page_owner() == $vars['entity']->guid) +if (elgg_get_page_owner_guid() == $vars['entity']->guid) $rel = 'me'; -else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) +else if (check_entity_relationship(elgg_get_page_owner_guid(), 'friend', $vars['entity']->guid)) $rel = 'friend'; if (!$banned) { diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php index e67d19c04..a90b12494 100644 --- a/mod/profile/views/default/profile/metatags.php +++ b/mod/profile/views/default/profile/metatags.php @@ -6,6 +6,6 @@ * */ -if ($owner = page_owner_entity()) { ?> +if ($owner = elgg_get_page_owner()) { ?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/profile_contents/details.php b/mod/profile/views/default/profile/profile_contents/details.php index 6a214557d..360ea0f9e 100755 --- a/mod/profile/views/default/profile/profile_contents/details.php +++ b/mod/profile/views/default/profile/profile_contents/details.php @@ -6,9 +6,9 @@ // Simple XFN $rel = ""; -if (page_owner() == $vars['entity']->guid) { +if (elgg_get_page_owner_guid() == $vars['entity']->guid) { $rel = 'me'; -} else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) { +} else if (check_entity_relationship(elgg_get_page_owner_guid(), 'friend', $vars['entity']->guid)) { $rel = 'friend'; } diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index 58386fc04..57c1dfb8b 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -12,7 +12,7 @@ if ($vars['entity']) { $user = get_entity($vars['entity']->guid); } } else { - $user = page_owner_entity(); + $user = elgg_get_page_owner(); } if (!$user) { // no user so we quit view @@ -36,7 +36,7 @@ if ($section == 'details') { $more_info .= "
"; } $profile_actions = ""; -if (isloggedin() && (get_loggedin_userid() == page_owner())) { +if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { $profile_actions = "
"; $profile_actions .= "username}/edit/details' class='action_button'>". elgg_echo('profile:edit') .""; $profile_actions .= "username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') .""; diff --git a/mod/reportedcontent/add.php b/mod/reportedcontent/add.php index 9b6032d04..9a377b2d3 100644 --- a/mod/reportedcontent/add.php +++ b/mod/reportedcontent/add.php @@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); gatekeeper(); // Get the current page's owner -$page_owner = page_owner_entity(); +$page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); diff --git a/mod/tagcloud/views/default/widgets/tagcloud/view.php b/mod/tagcloud/views/default/widgets/tagcloud/view.php index dc9666185..a290d8e37 100644 --- a/mod/tagcloud/views/default/widgets/tagcloud/view.php +++ b/mod/tagcloud/views/default/widgets/tagcloud/view.php @@ -4,6 +4,6 @@ if (!isset($num_items)) $num_items = 30; $prev_context = get_context(); - echo display_tagcloud(1, $num_items, 'tags', '', '', page_owner()); + echo display_tagcloud(1, $num_items, 'tags', '', '', elgg_get_page_owner_guid()); set_context($prev_context); ?> diff --git a/mod/thewire/index.php b/mod/thewire/index.php index 489427975..a0bc1757d 100644 --- a/mod/thewire/index.php +++ b/mod/thewire/index.php @@ -10,14 +10,14 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Get the current page's owner - $page_owner = page_owner_entity(); + $page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); } // title - if (page_owner() == $_SESSION['guid']) { + if (elgg_get_page_owner_guid() == $_SESSION['guid']) { $area2 = elgg_view_title(elgg_echo("thewire:read")); } else { $area2 = elgg_view_title(sprintf(elgg_echo("thewire:user"),$page_owner->name)); diff --git a/mod/thewire/start.php b/mod/thewire/start.php index 5091f5e5c..097d74001 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -60,7 +60,7 @@ //add submenu options if (get_context() == "thewire") { - if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) { + if ((elgg_get_page_owner_guid() == $_SESSION['guid'] || !elgg_get_page_owner_guid()) && isloggedin()) { add_submenu_item(elgg_echo('thewire:read'),$CONFIG->wwwroot."pg/thewire/" . get_loggedin_user()->username); add_submenu_item(elgg_echo('thewire:everyone'),$CONFIG->wwwroot."mod/thewire/everyone.php"); //add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php"); diff --git a/mod/thewire/views/default/widgets/thewire/view.php b/mod/thewire/views/default/widgets/thewire/view.php index 39fe368d0..c3f9e7858 100644 --- a/mod/thewire/views/default/widgets/thewire/view.php +++ b/mod/thewire/views/default/widgets/thewire/view.php @@ -10,6 +10,6 @@ $content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire' echo $content; if ($content) { - $blogurl = $vars['url'] . "pg/thewire/" . page_owner_entity()->username; + $blogurl = $vars['url'] . "pg/thewire/" . elgg_get_page_owner()->username; echo "
".elgg_echo('thewire:moreposts')."
"; } diff --git a/pages/friends/index.php b/pages/friends/index.php index 10128ffc7..e9ff87c16 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -6,11 +6,11 @@ * @subpackage Core */ -$owner = page_owner_entity(); +$owner = elgg_get_page_owner(); if (!$owner) { gatekeeper(); set_page_owner(get_loggedin_userid()); - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); } $title = sprintf(elgg_echo("friends:owned"), $owner->name); diff --git a/pages/friends/of.php b/pages/friends/of.php index b8740b88e..0e09e09f0 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -6,11 +6,11 @@ * @subpackage Core */ -$owner = page_owner_entity(); +$owner = elgg_get_page_owner(); if (!$owner) { gatekeeper(); set_page_owner(get_loggedin_userid()); - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); } $title = sprintf(elgg_echo("friends:of:owned"), $owner->name); diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php index c04b1d383..00661c2b1 100644 --- a/pages/friends/pickercallback.php +++ b/pages/friends/pickercallback.php @@ -22,7 +22,7 @@ if (!$members) { $friendspicker = (int) get_input('friendspicker', 0); // Get page owner (bomb out if there isn't one) -$pageowner = page_owner_entity(); +$pageowner = elgg_get_page_owner(); if (!$pageowner) { forward(); exit; diff --git a/pages/settings/index.php b/pages/settings/index.php index 01a60d753..dbc8c87da 100644 --- a/pages/settings/index.php +++ b/pages/settings/index.php @@ -6,14 +6,14 @@ * @subpackage Core */ -if (!page_owner()) { +if (!elgg_get_page_owner_guid()) { set_page_owner(get_loggedin_userid()); } // Make sure we don't open a security hole ... -if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { +if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) { set_page_owner(get_loggedin_userid()); } // Forward to the user settings -forward('pg/settings/user/' . page_owner_entity()->username . "/"); \ No newline at end of file +forward('pg/settings/user/' . elgg_get_page_owner()->username . "/"); \ No newline at end of file diff --git a/pages/settings/plugins.php b/pages/settings/plugins.php index a003be644..a768e69d7 100644 --- a/pages/settings/plugins.php +++ b/pages/settings/plugins.php @@ -10,7 +10,7 @@ gatekeeper(); // Make sure we don't open a security hole ... -if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { +if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) { set_page_owner(get_loggedin_userid()); } diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php index cd73c396b..38b0094ee 100644 --- a/pages/settings/statistics.php +++ b/pages/settings/statistics.php @@ -10,7 +10,7 @@ gatekeeper(); // Make sure we don't open a security hole ... -if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { +if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) { set_page_owner(get_loggedin_userid()); } diff --git a/pages/settings/user.php b/pages/settings/user.php index 6482ac9bf..62a3bb1ba 100644 --- a/pages/settings/user.php +++ b/pages/settings/user.php @@ -10,7 +10,7 @@ gatekeeper(); // Make sure we don't open a security hole ... -if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { +if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) { set_page_owner(get_loggedin_userid()); } diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 8526b9d92..001755932 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -6,11 +6,11 @@ $widgettypes = get_widget_types(); - $owner = page_owner_entity(); + $owner = elgg_get_page_owner(); - $area1widgets = get_widgets(page_owner(),get_context(),1); - $area2widgets = get_widgets(page_owner(),get_context(),2); - $area3widgets = get_widgets(page_owner(),get_context(),3); + $area1widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),1); + $area2widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),2); + $area3widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),3); if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) { @@ -23,7 +23,7 @@ - if(get_loggedin_userid() == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){ + if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){ if(get_context() == "profile") { ?> @@ -246,7 +246,7 @@ if(get_context() != "profile"){ /* on groups */ - + @@ -270,7 +270,7 @@ if(get_context() != "profile"){ /* on groups */ canEdit())){ + if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){ if(get_context() != "profile") { ?> diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php index 0da9f4c30..c7a27a16f 100644 --- a/views/default/notifications/settings/usersettings.php +++ b/views/default/notifications/settings/usersettings.php @@ -7,7 +7,7 @@ */ global $NOTIFICATION_HANDLERS; -$notification_settings = get_user_notification_settings(page_owner()); +$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid()); ?>