]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Refs #2543: Updated trunk mods and views to use the new functions from previous 2...
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 8 Feb 2011 19:52:10 +0000 (19:52 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 8 Feb 2011 19:52:10 +0000 (19:52 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8079 36083f99-b078-4883-b0ff-0f9b5a30f544

143 files changed:
actions/admin/user/ban.php
actions/admin/user/delete.php
actions/admin/user/removeadmin.php
actions/comments/add.php
actions/comments/delete.php
actions/email/save.php
actions/friends/add.php
actions/friends/addcollection.php
actions/friends/deletecollection.php
actions/friends/remove.php
actions/likes/add.php
actions/likes/delete.php
actions/notifications/settings/usersettings/save.php
actions/plugins/usersettings/save.php
actions/user/default_access.php
actions/user/language.php
actions/user/name.php
actions/user/password.php
actions/user/spotlight.php
actions/useradd.php
actions/widgets/delete.php
actions/widgets/move.php
documentation/examples/events/advanced.php
index.php
js/lib/languages.js
js/lib/session.js
js/lib/ui.widgets.js
mod/blog/actions/blog/auto_save_revision.php
mod/blog/actions/blog/save.php
mod/blog/lib/blog.php
mod/blog/views/default/blog/sidebar/archives.php
mod/blog/views/default/blog/sidebar/tagcloud.php
mod/bookmarks/bookmarklet.php
mod/bookmarks/pages/all.php
mod/bookmarks/pages/owner.php
mod/bookmarks/start.php
mod/bookmarks/views/default/bookmarks/bookmarklet.php
mod/bookmarks/views/default/bookmarks/owner_block.php
mod/defaultwidgets/start.php
mod/defaultwidgets/views/default/admin/appearance/default_dashboard_widgets.php
mod/defaultwidgets/views/default/admin/appearance/default_profile_widgets.php
mod/diagnostics/actions/download.php
mod/file/actions/file/upload.php
mod/file/index.php
mod/file/start.php
mod/file/views/default/file/embed_upload.php
mod/groups/actions/addtogroup.php
mod/groups/actions/delete.php
mod/groups/actions/discussion/save.php
mod/groups/actions/edit.php
mod/groups/actions/groupskillinvitation.php
mod/groups/actions/groupskillrequest.php
mod/groups/actions/invite.php
mod/groups/actions/join.php
mod/groups/actions/joinrequest.php
mod/groups/actions/leave.php
mod/groups/lib/discussion.php
mod/groups/lib/groups.php
mod/groups/start.php
mod/groups/views/default/forms/groups/edit.php
mod/groups/views/default/forms/groups/invite.php
mod/groups/views/default/group/default.php
mod/groups/views/default/groups/invitationrequests.php
mod/groups/views/default/groups/profile/buttons.php
mod/groups/views/default/groups/profile/closed_membership.php
mod/groups/views/default/groups/side_menu.php
mod/invitefriends/actions/invite.php
mod/invitefriends/start.php
mod/messageboard/actions/add.php
mod/messageboard/ajax_endpoint/load.php
mod/messageboard/history.php
mod/messageboard/index.php
mod/messageboard/views/default/messageboard/messageboard_content.php
mod/messageboard/views/default/widgets/messageboard/content.php
mod/messages/actions/messages/send.php
mod/messages/read.php
mod/messages/send.php
mod/messages/start.php
mod/messages/views/default/messages/topbar.php
mod/notifications/actions/groupsave.php
mod/notifications/actions/save.php
mod/notifications/groups.php
mod/notifications/index.php
mod/notifications/start.php
mod/notifications/views/default/notifications/subscriptions/collections.php
mod/notifications/views/default/notifications/subscriptions/forminternals.php
mod/notifications/views/default/notifications/subscriptions/groupsform.php
mod/notifications/views/default/notifications/subscriptions/personal.php
mod/pages/actions/pages/edit.php
mod/pages/index.php
mod/pages/start.php
mod/profile/start.php
mod/profile/views/default/profile/owner_block.php
mod/reportedcontent/actions/add.php
mod/reportedcontent/start.php
mod/reportedcontent/views/default/reportedcontent/form.php
mod/sitepages/start.php
mod/sitepages/views/default/sitepages/custom_frontpage.php
mod/thewire/actions/add.php
mod/thewire/actions/delete.php
mod/thewire/add.php
mod/thewire/everyone.php
mod/thewire/index.php
mod/thewire/start.php
mod/thewire/views/default/object/thewire.php
mod/thewire/views/default/thewire/profile_status.php
mod/twitterservice/start.php
mod/twitterservice/views/default/usersettings/twitterservice/edit.php
pages/account/forgotten_password.php
pages/account/register.php
pages/dashboard.php
pages/friends/add.php
pages/friends/collections.php
pages/river.php
pages/settings/account.php
pages/settings/statistics.php
pages/settings/tools.php
views/default/admin/dashboard.php
views/default/core/account/login_dropdown.php
views/default/core/friends/collection.php
views/default/core/friends/collectiontabs.php
views/default/core/likes/display.php
views/default/core/river/controls.php
views/default/core/settings/account/password.php
views/default/core/settings/statistics/numentities.php
views/default/core/settings/statistics/online.php
views/default/core/settings/tools/plugin.php
views/default/export/entity.php
views/default/forms/comments/add.php
views/default/forms/comments/inline.php
views/default/forms/register.php
views/default/forms/useradd.php
views/default/icon/user/default.php
views/default/js/initialize_elgg.php
views/default/layout/elements/owner_block.php
views/default/layout/shells/admin.php
views/default/layout/shells/content/filter.php
views/default/layout/shells/content/header.php
views/default/navigation/menu/user_hover.php
views/default/page/elements/content_header.php
views/default/page/elements/topbar.php
views/default/user/default.php
views/foaf/page/shells/default.php

index a8fa579258c25ab6a66118fbcc1f3d6ecc85fa9f..209ece2a05717b28b9afd41d5ac8535003114a26 100644 (file)
@@ -12,7 +12,7 @@
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
        register_error(elgg_echo('admin:user:self:ban:no'));
        forward(REFERER);
 }
index c6ed5b819f9782f87d1beee9d9dafea1dc4f0cf6..04061ac0ca5258af1bc1e4c8b29cd55c2efa9c25 100644 (file)
@@ -13,7 +13,7 @@
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
        register_error(elgg_echo('admin:user:self:delete:no'));
        forward(REFERER);
 }
index 4466e925f1fe1d80324c9a934cfc0927dd2d5a2d..8cebc707861d3ae6b02cceba5f0cee41a6fe353e 100644 (file)
@@ -9,7 +9,7 @@
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
        register_error(elgg_echo('admin:user:self:removeadmin:no'));
        forward(REFERER);
 }
index 38c91c412f8e96a7b55b0e14ab62ee519472a1b8..5bd74141310db4785cca8c51f8c4505cfced5c7b 100644 (file)
@@ -21,7 +21,7 @@ if (!$entity) {
        forward(REFERER);
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $annotation = create_annotation($entity->guid,
                                                                'generic_comment',
index d0f5c7b8454d37bb533e04f2cd22c8c152806816..54eb9707776c9a3e38858b5c995e914c337df324 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 // Ensure we're logged in
-if (!isloggedin()) {
+if (!elgg_is_logged_in()) {
        forward();
 }
 
index 13bc14d650d12ac37cd2d16dca2f588eb7ecf4ca..d0ce4571bf6724edb5754c83094cf5631c179e59 100644 (file)
@@ -10,7 +10,7 @@ $email = get_input('email');
 $user_id = get_input('guid');
 
 if (!$user_id) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
 } else {
        $user = get_entity($user_id);
 }
index e6fa5b62efcf49fab9edfeddfcc2a2325c816f96..53e4971d4ad2328b1651cf499593cb4c03a9102c 100644 (file)
@@ -14,7 +14,7 @@ $errors = false;
 
 // Get the user
 try {
-       if (!get_loggedin_user()->addFriend($friend_guid)) {
+       if (!elgg_get_logged_in_user_entity()->addFriend($friend_guid)) {
                $errors = true;
        }
 } catch (Exception $e) {
@@ -23,7 +23,7 @@ try {
 }
 if (!$errors) {
        // add to river
-       add_to_river('friends/river/create', 'friend', get_loggedin_userid(), $friend_guid);
+       add_to_river('friends/river/create', 'friend', elgg_get_logged_in_user_guid(), $friend_guid);
        system_message(elgg_echo("friends:add:successful", array($friend->name)));
 }
 
index 92c78a2c155f9fafec4dc8179830eb8819331fe4..eac8bced8776ddf7f2eb284401cb39e6d31c04d0 100644 (file)
@@ -13,7 +13,7 @@ $friends = get_input('friends_collection');
 if ($collection_name) {
 
        //create the collection
-       $create_collection = create_access_collection($collection_name, get_loggedin_userid());
+       $create_collection = create_access_collection($collection_name, elgg_get_logged_in_user_guid());
 
        //if the collection was created and the user passed some friends from the form, add them
        if ($create_collection && (!empty($friends))) {
@@ -26,7 +26,7 @@ if ($collection_name) {
        // Success message
        system_message(elgg_echo("friends:collectionadded"));
        // Forward to the collections page
-       forward("pg/collections/" . get_loggedin_user()->username);
+       forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
 
 } else {
        register_error(elgg_echo("friends:nocollectionname"));
index 1c3d878a171b6fd1c07b5fb60c390afe297cb4fa..f0ceaf023dda7d39276e4f4f08483f66e5c57439 100644 (file)
@@ -13,7 +13,7 @@ $get_collection = get_access_collection($collection_id);
 
 if ($get_collection) {
 
-       if ($get_collection->owner_guid == get_loggedin_userid()) {
+       if ($get_collection->owner_guid == elgg_get_logged_in_user_guid()) {
 
                $delete_collection = delete_access_collection($collection_id);
 
@@ -33,4 +33,4 @@ if ($get_collection) {
 }
 
 // Forward to the collections page
-forward("pg/collections/" . get_loggedin_user()->username);
+forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
index 0a43c95bc43527b84eee7f92a67612094768c3ab..d69d18f3150afcbe480e8541568fdd9928135522 100644 (file)
@@ -14,7 +14,7 @@ $errors = false;
 // Get the user
 try{
        if ($friend instanceof ElggUser) {
-               get_loggedin_user()->removeFriend($friend_guid);
+               elgg_get_logged_in_user_entity()->removeFriend($friend_guid);
        } else {
                register_error(elgg_echo("friends:remove:failure", array($friend->name)));
                $errors = true;
index 9abe0b60e7c3ba6c26f80d502e24f938e6444c5b..a59ccae2bdcd84ecfaad712d43864bb728d05de8 100644 (file)
@@ -21,12 +21,12 @@ if (!$entity) {
 }
 
 // cannot like your own stuff
-if (get_loggedin_userid() == $entity->getOwnerGUID()) {
+if (elgg_get_logged_in_user_guid() == $entity->getOwnerGUID()) {
        register_error(elgg_echo("likes:no_self_like"));
        forward(REFERER);
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 $annotation = create_annotation($entity->guid,
                                                                'likes',
                                                                "likes",
index 7ccf2de37e5d2b1df03d7ae68a7bc9adec86a895..168818a60d5d43b75f0599b95e28f2126335bdad 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 // Ensure we're logged in
-if (!isloggedin()) {
+if (!elgg_is_logged_in()) {
        forward();
 }
 
index eaa01c3ad32ec1b9c5bb770495991ecdb8bb3a22..455a444e1d140d8d072a83c0f480f24a64d87cee 100644 (file)
@@ -17,7 +17,7 @@ foreach ($method as $k => $v) {
                continue;
        }
 
-       $result = set_user_notification_setting(get_loggedin_userid(), $k, ($v == 'yes') ? true : false);
+       $result = set_user_notification_setting(elgg_get_logged_in_user_guid(), $k, ($v == 'yes') ? true : false);
 
        if (!$result) {
                register_error(elgg_echo('notifications:usersettings:save:fail'));
index ddf7e822efffb0fa435d3843d3d0b447e17fce99..a54df627acbf234654b9475a24b6d4ef08e22ddc 100644 (file)
@@ -13,7 +13,7 @@ $result = false;
 
 foreach ($params as $k => $v) {
        // Save
-       $result = set_plugin_usersetting($k, $v, get_loggedin_userid(), $plugin);
+       $result = set_plugin_usersetting($k, $v, elgg_get_logged_in_user_guid(), $plugin);
 
        // Error?
        if (!$result) {
index 0b7d0bfbd50489015b526278ede5a8e5ed8c934b..5ddd86296cf1814575f6361e33c2612c970879df 100644 (file)
@@ -11,7 +11,7 @@ if (elgg_get_config('allow_user_default_access')) {
        $user_id = get_input('guid');
 
        if (!$user_id) {
-               $user = get_loggedin_user();
+               $user = elgg_get_logged_in_user_entity();
        } else {
                $user = get_entity($user_id);
        }
index 44c591d7ae12a257ef8c93b0eab45838c0bc850a..30d3b45e81b68165fe9380151e9b0500f8569b69 100644 (file)
@@ -10,7 +10,7 @@ $language = get_input('language');
 $user_id = get_input('guid');
 
 if (!$user_id) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
 } else {
        $user = get_entity($user_id);
 }
index e293d409cc0b7325fd136a80660c806e182b8092..881019e86f0e9cca4437850a92a159c761e008a3 100644 (file)
@@ -10,7 +10,7 @@ $name = strip_tags(get_input('name'));
 $user_id = get_input('guid');
 
 if (!$user_id) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
 } else {
        $user = get_entity($user_id);
 }
index bbeb0ea7ff9cb18041bf56b240f6f34f7b524415..8619372e40531d024933e4840714b8b9a6e7f785 100644 (file)
@@ -12,14 +12,14 @@ $password2 = get_input('password2');
 $user_id = get_input('guid');
 
 if (!$user_id) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
 } else {
        $user = get_entity($user_id);
 }
 
 if (($user) && ($password != "")) {
        // let admin user change anyone's password without knowing it except his own.
-       if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+       if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
                $credentials = array(
                        'username' => $user->username,
                        'password' => $current_password
index 390197e78570673993dc47e9b928912002aeedf3..202dde387670ea148123ccb944dc6f55d7181889 100644 (file)
@@ -14,6 +14,6 @@ if ($closed != 'true') {
        $closed = true;
 }
 
-get_loggedin_user()->spotlightclosed = $closed;
+elgg_get_logged_in_user_entity()->spotlightclosed = $closed;
 // exit as this action is called through Ajax
 exit;
\ No newline at end of file
index 0219361fbfffd5bf5cc4f8217b2eca9f621362cd..f20b9d0703ebcd4a8c3082c088a2cc529413eea1 100644 (file)
@@ -29,7 +29,7 @@ try {
                }
 
                $new_user->admin_created = TRUE;
-               $new_user->created_by_guid = get_loggedin_userid();
+               $new_user->created_by_guid = elgg_get_logged_in_user_guid();
 
                $subject = elgg_echo('useradd:subject');
                $body = elgg_echo('useradd:body', array(
index 167324b0ca58f73eb3f248ea32cbcb8db64f2f1e..5b8aaf75ea704777d79ed7e616f2166d41426441 100644 (file)
@@ -8,7 +8,7 @@
 
 $guid = get_input('guid');
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $widget = get_entity($guid);
 if ($widget && $user->canEdit() && $widget->delete()) {
index 276dcb55ea951f501ac4931792335f68b7c9abd6..2edc7912e64b1a30ae57fb50d3658be5e3f648b1 100644 (file)
@@ -10,7 +10,7 @@ $guid = get_input('guid');
 $column = get_input('column', 1);
 $position = get_input('position');
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $widget = get_entity($guid);
 if ($widget && $user->canEdit()) {
index f566e0006ed26719760fe93650a3e5827f05b743..22a407579829dac0db05e088bb6aa6e2b9931902 100644 (file)
@@ -5,6 +5,6 @@ elgg_register_event_handler('create', 'object', 'example_event_handler');
 function example_event_handler($event, $type, $params) {
        // Don't allow any non-admin users to create objects
        // Returning false from this function will halt the creation of the object.
-       return isadminloggedin();
+       return elgg_is_admin_logged_in();
 }
 
index e35a8efddb4b089b317eb1fd10de109ee1be3d24..6642984aafe8ae57eca58476fd6158031dbdc5f5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -16,7 +16,7 @@ if (elgg_trigger_plugin_hook('index', 'system', null, FALSE) != FALSE) {
        exit;
 }
 
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        forward('pg/activity/');
 }
 
index 727e939c0eb2dbae9ddce2aa3a1037c0c1130040..e8c2ad0ca045cb61e08c9533dcb976e273c86d0c 100644 (file)
@@ -41,7 +41,7 @@ elgg.reload_all_translations = function(language) {
  * @return {String}
  */
 elgg.get_language = function() {
-       var user = elgg.get_loggedin_user();
+       var user = elgg.elgg_get_logged_in_user_entity();
 
        if (user && user.language) {
                return user.language;
index 613910412885db43aa01abd259cf48d099e1cca0..2d319b00f5db2b666f15b4cbf9ab9db057fd420a 100644 (file)
@@ -83,30 +83,30 @@ elgg.session.cookie = function (name, value, options) {
 /**
  * @return {ElggUser} The logged in user
  */
-elgg.get_loggedin_user = function() {
+elgg.elgg_get_logged_in_user_entity = function() {
        return elgg.session.user;
 };
 
 /**
  * @return {number} The GUID of the logged in user
  */
-elgg.get_loggedin_userid = function() {
-       var user = elgg.get_loggedin_user();
+elgg.elgg_get_logged_in_user_guid = function() {
+       var user = elgg.elgg_get_logged_in_user_entity();
        return user ? user.guid : 0;
 };
 
 /**
  * @return {boolean} Whether there is a user logged in
  */
-elgg.isloggedin = function() {
-       return (elgg.get_loggedin_user() instanceof elgg.ElggUser);
+elgg.elgg_is_logged_in = function() {
+       return (elgg.elgg_get_logged_in_user_entity() instanceof elgg.ElggUser);
 };
 
 /**
  * @return {boolean} Whether there is an admin logged in
  */
-elgg.isadminloggedin = function() {
-       var user = elgg.get_loggedin_user();
+elgg.elgg_is_admin_logged_in = function() {
+       var user = elgg.elgg_get_logged_in_user_entity();
        return (user instanceof elgg.ElggUser) && user.isAdmin();
 };
 
index 922029c34af7061cdc1ad67724b8ed4a81e4369b..660548a153ad3e1cad356a2495364568bd1d9e6b 100644 (file)
@@ -56,7 +56,7 @@ elgg.ui.widgets.add = function(event) {
        elgg.action('widgets/add', {
                data: {
                        handler: type,
-                       user_guid: elgg.get_loggedin_userid(),
+                       user_guid: elgg.elgg_get_logged_in_user_guid(),
                        context: $("input[name='widget_context']").val()
                },
                success: function(json) {
index d400dda909df67ccb2585d444d22b3e7aa199358..86812c6d3bbc353ecb79f76b84439a105d564959 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 $guid = get_input('guid');
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 $title = get_input('title');
 $description = get_input('description');
 $excerpt = get_input('excerpt');
index 4e6e9133b38f41e1948af9904938aef4e5675654..dbbe25e04cd55c922f836f465c1ccb001a00674d 100644 (file)
@@ -11,7 +11,7 @@
 // store errors to pass along
 $error = FALSE;
 $error_forward_url = REFERER;
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 // edit or create a new entity
 $guid = get_input('guid');
@@ -146,7 +146,7 @@ if (!$error) {
 
                // @todo do we want to alert on updates?
                if ($new_post && $blog->status == 'published') {
-                       add_to_river('river/object/blog/create', 'create', get_loggedin_userid(), $blog->getGUID());
+                       add_to_river('river/object/blog/create', 'create', elgg_get_logged_in_user_guid(), $blog->getGUID());
                }
                if ($blog->status == 'published') {
                        forward($blog->getURL());
index 3a89850262bdd5f968d9e9c1bbfb48e0427c03c5..5e2cc7c52f6eef86a3995e632cd3c7b5fdbbf16e 100644 (file)
@@ -67,7 +67,7 @@ function blog_get_page_content_list($container_guid = NULL) {
                //'order_by_metadata' => array('name'=>'publish_date', 'direction'=>'DESC', 'as'=>'int')
        );
 
-       $loggedin_userid = get_loggedin_userid();
+       $loggedin_userid = elgg_get_logged_in_user_guid();
        if ($container_guid) {
                $options['container_guid'] = $container_guid;
                $container = get_entity($container_guid);
@@ -90,7 +90,7 @@ function blog_get_page_content_list($container_guid = NULL) {
 
                if (elgg_instanceof($container, 'group')) {
                        $return['filter'] = '';
-                       if ($container->isMember(get_loggedin_user())) {
+                       if ($container->isMember(elgg_get_logged_in_user_entity())) {
                                $url = "pg/blog/add/$container->guid";
                                $params = array(
                                        'href' => $url,
@@ -108,7 +108,7 @@ function blog_get_page_content_list($container_guid = NULL) {
 
        // show all posts for admin or users looking at their own blogs
        // show only published posts for other users.
-       if (!(isadminloggedin() || (isloggedin() && $container_guid == $loggedin_userid))) {
+       if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $container_guid == $loggedin_userid))) {
                $options['metadata_name_value_pairs'] = array(
                        array('name' => 'status', 'value' => 'published'),
                        //array('name' => 'publish_date', 'operand' => '<', 'value' => time())
@@ -162,7 +162,7 @@ function blog_get_page_content_friends($user_guid) {
 
                // admin / owners can see any posts
                // everyone else can only see published posts
-               if (!(isadminloggedin() || (isloggedin() && $owner_guid == get_loggedin_userid()))) {
+               if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $owner_guid == elgg_get_logged_in_user_guid()))) {
                        if ($upper > $now) {
                                $upper = $now;
                        }
@@ -222,7 +222,7 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 
        // admin / owners can see any posts
        // everyone else can only see published posts
-       if (!(isadminloggedin() || (isloggedin() && $owner_guid == get_loggedin_userid()))) {
+       if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $owner_guid == elgg_get_logged_in_user_guid()))) {
                if ($upper > $now) {
                        $upper = $now;
                }
@@ -321,7 +321,7 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
                }
        } else {
                if (!$guid) {
-                       $container = get_loggedin_user();
+                       $container = elgg_get_logged_in_user_entity();
                } else {
                        $container = get_entity($guid);
                }
index 477e1261e6c11586fcffadf23da3ca9064c33353..bd74500ca939ab215e5920bcd91f23b84e828ed6 100644 (file)
@@ -3,7 +3,7 @@
  * Blog archives
  */
 
-$loggedin_user = get_loggedin_user();
+$loggedin_user = elgg_get_logged_in_user_entity();
 $page_owner = elgg_get_page_owner_entity();
 
 // This is a limitation of the URL schema.
index f1ef7ffdb2fc043087ab60a7b86461a893516895..70c45439026bb5029308e30f32a1641115b0d63a 100644 (file)
@@ -3,7 +3,7 @@
  * Blog tag cloud
  */
 
-$loggedin_user = get_loggedin_user();
+$loggedin_user = elgg_get_logged_in_user_entity();
 $page_owner = elgg_get_page_owner_entity();
 
 if ($page_owner && $vars['page'] != 'friends') {
index a156cf035cda56d1525e4baa4c4a399c0a10f725..9f9dd5150862308fe3b2df68148c6491b40e330e 100644 (file)
@@ -13,8 +13,8 @@ gatekeeper();
 
 // Get the current page's owner
 $page_owner = elgg_get_page_owner_entity();
-if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) {
-       $page_owner = get_loggedin_user();
+if ($page_owner === false || is_null($page_owner) && (elgg_get_logged_in_user_entity())) {
+       $page_owner = elgg_get_logged_in_user_entity();
        set_page_owner($page_owner->getGUID());
 }
                
index 2bde462bac49852a9195ccc19d96018fc0ae1828..3442f32c75984b02e342dd436d027beac60b1421 100644 (file)
@@ -10,7 +10,7 @@ elgg_push_breadcrumb(elgg_echo('bookmarks'));
 
 $page_owner = elgg_get_page_owner_entity();
 if (!$page_owner) {
-       $page_owner = get_loggedin_userid();
+       $page_owner = elgg_get_logged_in_user_guid();
        elgg_set_page_owner_guid($page_owner);
 }
 
index 1e45bc518f856300c57353ff2c617efa511819ee..5b864ff488a6fae44e610a46084936b01de2afab 100644 (file)
@@ -10,7 +10,7 @@ elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
 
 $page_owner = elgg_get_page_owner_entity();
 if (!$page_owner) {
-       $page_owner = get_loggedin_userid();
+       $page_owner = elgg_get_logged_in_user_guid();
        elgg_set_page_owner_guid($page_owner);
 }
 
index b7e2e5df9a7a2fdf3ba14e2404b8dd8b8560c460..04a452d3250c18aaf475351b30ebdd9c57f51600 100644 (file)
@@ -59,10 +59,10 @@ function bookmarks_pagesetup() {
        //add submenu options
        if (get_context() == "bookmarks") {
 
-               if (isloggedin()) {
+               if (elgg_is_logged_in()) {
                        // link to add bookmark form
                        if ($page_owner instanceof ElggGroup) {
-                               if ($page_owner->isMember(get_loggedin_user())) {
+                               if ($page_owner->isMember(elgg_get_logged_in_user_entity())) {
                                        add_submenu_item(elgg_echo('bookmarks:add'), $CONFIG->wwwroot."pg/bookmarks/add/" . $page_owner->username);
                                }
                        } else {
@@ -82,7 +82,7 @@ function bookmarks_pagesetup() {
                }
 
                // Bookmarklet
-               if ((isloggedin()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
+               if ((elgg_is_logged_in()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
 
                        $bmtext = elgg_echo('bookmarks:bookmarklet');
                        if ($page_owner instanceof ElggGroup) {
index bb2cf885e9982b04a6affdc6cb079dd4c00817a6..5316194096de989fd1a56ca6bb3c5b9734123a00 100644 (file)
@@ -15,7 +15,7 @@ if ($page_owner instanceof ElggGroup) {
        $name = $page_owner->username;
 }
 
-if (!$name && ($user = get_loggedin_user())) {
+if (!$name && ($user = elgg_get_logged_in_user_entity())) {
        $name = $user->username;
 }
 
index 654ff91522bcf63cb755fe094a1a01c656fb4f8e..d9b31d8d4ca4b862ed1de9dba33867a7ceb8bd31 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 $label = elgg_echo('bookmarks:this');
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 $url = "'" . $vars['url'] . "pg/bookmarks/add/{$user->username}?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)";
 
 ?>
index 653ac6fce5a32c75664a492708de759abbdf0c48..89754f4f4e580a17ea9733501a2b7484504dc07a 100644 (file)
@@ -25,7 +25,7 @@ function defaultwidgets_init() {
        elgg_register_event_handler('create', 'user', 'defaultwidgets_newusers' );
 
        // set the widget access to the default access on validation if this is not an admin-created user
-       if (!isadminloggedin()) {
+       if (!elgg_is_admin_logged_in()) {
                elgg_register_event_handler('validate', 'user', 'defaultwidgets_reset_access');
        }
 
@@ -93,7 +93,7 @@ function defaultwidgets_newusers($event, $object_type, $object) {
        // get the new user guid
        $guid = $object->guid;
 
-       if (isadminloggedin()) {
+       if (elgg_is_admin_logged_in()) {
                // this is an admin-created user
                // no permissions problems, so set proper access now
                // use system default access (not the admin's default access!, because that could be a personal access level)
index b6cc010dff7a9bc0998e911ae776c469d9b7fd43..e4a6ca51f1d01a1f5da67dc459dbe648ab5b4ed8 100644 (file)
@@ -7,7 +7,7 @@
  **/
 
 // Set admin user for user block
-set_page_owner(get_loggedin_userid());
+set_page_owner(elgg_get_logged_in_user_guid());
 
 // create the view
 $time = time();
index bb1f3fbe0553949bcc834fa285b140d3c818b686..b95a123eba400caabc2ea41d72684bce5e1011ad 100644 (file)
@@ -7,7 +7,7 @@
  **/
 
 // set admin user for user block
-set_page_owner(get_loggedin_userid());
+set_page_owner(elgg_get_logged_in_user_guid());
 
 // create the view
 $time = time();
index 3c096eb0a297661ea41a64f0fccf77f4141ac0ff..a79527f78df8de7110641f4e9b46e3868497bc8e 100644 (file)
@@ -7,7 +7,7 @@
 
        admin_gatekeeper();
 
-       $output = elgg_echo('diagnostics:header', array(date('r'), get_loggedin_user()->name));
+       $output = elgg_echo('diagnostics:header', array(date('r'), elgg_get_logged_in_user_entity()->name));
        $output = elgg_trigger_plugin_hook('diagnostics:report', 'system', null, $output);
 
        header("Cache-Control: public");
index 5ce98c101faa90d17667ebed43d9f82901946b67..1a30b6cefcf323190799c14dcdd5499f66895859 100644 (file)
@@ -16,7 +16,7 @@ $tags = get_input("tags");
 $ajax = get_input('ajax', FALSE);
 
 if ($container_guid == 0) {
-       $container_guid = get_loggedin_userid();
+       $container_guid = elgg_get_logged_in_user_guid();
 }
 
 elgg_make_sticky_form('file');
@@ -166,7 +166,7 @@ if ($new_file) {
 
                } else {
                        system_message($message);
-                       add_to_river('river/object/file/create', 'create', get_loggedin_userid(), $file->guid);
+                       add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
                }
        } else {
                // failed to save file object - nothing we can do about this
index 44906d72d9d599f4fff6ef094215cdf622986d6f..4a8e35bdb0da078cbcb5c557bf58ae09cbb12fdd 100644 (file)
@@ -17,7 +17,7 @@ elgg_push_breadcrumb($owner->name);
 
 $params = array();
 
-if ($owner->guid == get_loggedin_userid()) {
+if ($owner->guid == elgg_get_logged_in_user_guid()) {
        // user looking at own files
        $title = elgg_echo('file:yours');
        $params['filter_context'] = 'mine';
@@ -31,7 +31,7 @@ if ($owner->guid == get_loggedin_userid()) {
        // group files
        $title = elgg_echo("file:user", array($owner->name));
        $params['filter'] = '';
-       if ($owner->isMember(get_loggedin_user())) {
+       if ($owner->isMember(elgg_get_logged_in_user_entity())) {
                $url = "pg/file/add/$owner->guid";
                $vars = array(
                        'href' => $url,
index 360f64d1fff274ca6f43a04bb5e56878eef6265c..cea8b6bd5facb75334c7073efb0e18353abccada 100644 (file)
@@ -364,7 +364,7 @@ function file_embed_get_sections($hook, $type, $value, $params) {
  */
 function file_embed_get_items($hook, $type, $value, $params) {
        $options = array(
-               'owner_guid' => get_loggedin_userid(),
+               'owner_guid' => elgg_get_logged_in_user_guid(),
                'type_subtype_pair' => array('object' => 'file'),
                'count' => TRUE
        );
index 8a54a4fa9182d4ae3b18c2b31c94da9d02962cb7..229fcd40be8a85338097c39abe46758cafc98580 100644 (file)
@@ -3,7 +3,7 @@
  * Files upload form for embed
  */
 
-$access_id = get_default_access(get_loggedin_user());
+$access_id = get_default_access(elgg_get_logged_in_user_entity());
 if ($categories = elgg_view('categories', $vars)) {
        $categories = "<p>$categories</p>";
 }
index 651b90abbffc1db17c20c9b046acd12e0b371923..d75c5fdb8c8b9ba22fc60f17a0eb04771184a5bc 100644 (file)
@@ -4,7 +4,7 @@
  *
  * @package ElggGroups
  */
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 
 $user_guid = get_input('user_guid');
 if (!is_array($user_guid))
@@ -20,7 +20,7 @@ if (sizeof($user_guid)) {
 
                if ($user && $group) {
 
-                       //if (get_loggedin_userid() == $group->owner_guid)
+                       //if (elgg_get_logged_in_user_guid() == $group->owner_guid)
                        if ($group->canEdit()) {
 
                                // If the group is open or the user has requested membership
index 5672e8c47e1e58fc82890249cc91df88c774c7b7..a99b3a2c66274f72c8d167017486a6d031b235c0 100644 (file)
@@ -16,5 +16,5 @@ if (($entity) && ($entity instanceof ElggGroup))
 else
        register_error(elgg_echo('group:notdeleted'));
 
-$url_name = get_loggedin_user()->username;
+$url_name = elgg_get_logged_in_user_entity()->username;
 forward(elgg_get_site_url() . "pg/groups/member/{$url_name}");
index 8e8f08a50028756fdfabf3928f45d68f6ea55714..f553b562c6b443a9eecf3907e75a501a3e391a6e 100644 (file)
@@ -67,7 +67,7 @@ elgg_clear_sticky_form('topic');
 // handle results differently for new topics and topic edits
 if ($new_topic) {
        system_message(elgg_echo('discussion:topic:created'));
-       add_to_river('river/forum/topic/create', 'create', get_loggedin_userid(), $topic->guid);
+       add_to_river('river/forum/topic/create', 'create', elgg_get_logged_in_user_guid(), $topic->guid);
 } else {
        system_message(elgg_echo('discussion:topic:updated'));
 }
index c8a68d238277f1749e56bcf6cd58285104d0c9b2..e1073924485163af3403a985a3b40c85b0a8d334 100644 (file)
@@ -34,7 +34,7 @@ foreach ($CONFIG->group as $shortname => $valuetype) {
 $input['name'] = get_input('name');
 $input['name'] = html_entity_decode($input['name'], ENT_COMPAT, 'UTF-8');
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $group_guid = (int)get_input('group_guid');
 $new_group_flag = $group_guid == 0;
index 503c419390b8ffb642ae1724275bc106feb48711..516490bc9e33ceaeaae816c5fc25af892b40a4bd 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 $user = get_entity($user_guid);
index f7f8a515789508d15aa233afa6a4172e6707dffb..9d45bb25f45609a5e95d34d45cab9d943c3d39b0 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 $user = get_entity($user_guid);
index e8eeb3330796b4b201fbf7c88d0549d0a508a8ae..1f828107172bdc9c7686754240c3e6619db566b7 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 
 $user_guid = get_input('user_guid');
 if (!is_array($user_guid)) {
index e058cdc2242cebdfe7f81dd9bea4caa34d6e53e2..72294c3ad1438db978e54acb433d248c797f3062 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 // @todo fix for #287
index c1d41e8e89b8de452e9ee5ad83ad0ebdb33414aa..1631712b6443f53d04ecaf3ec5e21c7b5d1a524a 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 
index a9163a3d1dac79019a7db3687b25d75016280fa5..390870df19df4feaba604cefc13ab2c999838155 100644 (file)
@@ -10,7 +10,7 @@ $group_guid = get_input('group_guid');
 
 $user = NULL;
 if (!$user_guid) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
 } else {
        $user = get_entity($user_guid);
 }
@@ -20,7 +20,7 @@ $group = get_entity($group_guid);
 set_page_owner($group->guid);
 
 if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) {
-       if ($group->getOwnerGUID() != get_loggedin_userid()) {
+       if ($group->getOwnerGUID() != elgg_get_logged_in_user_guid()) {
                if ($group->leave($user)) {
                        system_message(elgg_echo("groups:left"));
                } else {
index 4a3cd989a17d5eeb1558109f846c989433e50f81..62b0552e0ea5a8d1d91f010623daa2881c9d7fb1 100644 (file)
@@ -169,7 +169,7 @@ function discussion_handle_view_page($guid) {
        if ($topic->status == 'closed') {
                $content .= elgg_view_comments($topic, false);
                $content .= elgg_view('discussion/closed');
-       } elseif ($group->isMember() || isadminloggedin()) {
+       } elseif ($group->isMember() || elgg_is_admin_logged_in()) {
                $content .= elgg_view_comments($topic);
        } else {
                $content .= elgg_view_comments($topic, false);
index cff7fe258cfae41c31567f7869276c378f499cb2..8faba3179b44828a5504db7deaa8ca155722eeb3 100644 (file)
@@ -121,7 +121,7 @@ function groups_handle_edit_page($page, $guid = 0) {
        gatekeeper();
        
        if ($page == 'add') {
-               elgg_set_page_owner_guid(get_loggedin_userid());
+               elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
                $title = elgg_echo('groups:add');
                elgg_push_breadcrumb($title);
                $content = elgg_view('groups/edit');
index 5e318a5f1eb8c5a4aa6bb27f19e583503b1fafdd..44b5363dce4647593a76371d38a53101aba9f703 100644 (file)
@@ -130,14 +130,14 @@ function groups_submenus() {
 
        if (elgg_get_context() == 'groups') {
                if ($page_owner instanceof ElggGroup) {
-                       if (isloggedin() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
+                       if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
                                $url = elgg_get_site_url() . "pg/groups/requests/{$page_owner->getGUID()}";
                                add_submenu_item(elgg_echo('groups:membershiprequests'), $url, 'groupsactions1');
                        }
                } else {
                        add_submenu_item(elgg_echo('groups:all'), "pg/groups/world/", 'groupslinks1');
 
-                       if ($user = get_loggedin_user()) {
+                       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:yours'), "pg/groups/member/$user->username", 'groupslinks1');
                                add_submenu_item(elgg_echo('groups:invitations'), "pg/groups/invitations/$user->username", 'groupslinks1');
@@ -295,7 +295,7 @@ function groups_create_event_listener($event, $object_type, $object) {
  */
 function groups_read_acl_plugin_hook($hook, $entity_type, $returnvalue, $params) {
        //error_log("READ: " . var_export($returnvalue));
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
        if ($user) {
                // Not using this because of recursion.
                // Joining a group automatically add user to ACL,
@@ -319,7 +319,7 @@ function groups_read_acl_plugin_hook($hook, $entity_type, $returnvalue, $params)
  */
 function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params) {
        $page_owner = elgg_get_page_owner_entity();
-       if (!$loggedin = get_loggedin_user()) {
+       if (!$loggedin = elgg_get_logged_in_user_entity()) {
                return $returnvalue;
        }
 
@@ -646,7 +646,7 @@ function groupforumtopic_notify_message($hook, $entity_type, $returnvalue, $para
                if ($method == 'sms') {
                        return elgg_echo("groupforumtopic:new") . ': ' . $url . " ({$owner->name}: {$title})";
                } else {
-                       return get_loggedin_user()->name . ' ' . elgg_echo("groups:viagroups") . ': ' . $title . "\n\n" . $msg . "\n\n" . $entity->getURL();
+                       return elgg_get_logged_in_user_entity()->name . ' ' . elgg_echo("groups:viagroups") . ': ' . $title . "\n\n" . $msg . "\n\n" . $entity->getURL();
                }
        }
        return null;
@@ -661,9 +661,9 @@ function groupforumtopic_notify_message($hook, $entity_type, $returnvalue, $para
 function groups_can_edit_discussion($entity, $group_owner) {
 
        //logged in user
-       $user = get_loggedin_userid();
+       $user = elgg_get_logged_in_user_guid();
 
-       if (($entity->owner_guid == $user) || $group_owner == $user || isadminloggedin()) {
+       if (($entity->owner_guid == $user) || $group_owner == $user || elgg_is_admin_logged_in()) {
                return true;
        } else {
                return false;
index e0c90af8dfdba348d2df6bd82269bcfc969fc17e..7d24a3c00d9428502da73c0648029b4dbc5d1773 100644 (file)
@@ -66,7 +66,7 @@ if ($group_profile_fields > 0) {
 if (get_plugin_setting('hidden_groups', 'groups') == 'yes') {
        $this_owner = $vars['entity']->owner_guid;
        if (!$this_owner) {
-               $this_owner = get_loggedin_userid();
+               $this_owner = elgg_get_logged_in_user_guid();
        }
        $access = array(
                ACCESS_FRIENDS => elgg_echo("access:friends:label"),
index 8b8ccb665a6e4cf2a3c22c7f0af41562cf17c914..2c89db3848feca479abbc86cdbf1bfb2997ecdb0 100644 (file)
@@ -8,7 +8,7 @@
        $group = $vars['entity'];
        $owner = get_entity($vars['entity']->owner_guid);
        $forward_url = $group->getURL();
-       $friends = get_loggedin_user()->getFriends('', 0);
+       $friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
 
 if ($friends) {
 ?>
index d025a894bb3eaa44ad22fefde6c5b11a1904f8ee..63e1e4226006a4f4c838e6fc7476da2407d67a7b 100644 (file)
@@ -25,7 +25,7 @@ $metadata = "<ul class=\"elgg-list-metadata\"><li>$mem</li>";
 $metadata .= "<li>$num_members $members_string</li>";
 
 // feature link
-if (isadminloggedin()) {
+if (elgg_is_admin_logged_in()) {
        if ($group->featured_group == "yes") {
                $url = "action/groups/featured?group_guid={$group->guid}&action_type=unfeature";
                $wording = elgg_echo("groups:makeunfeatured");
index 9bb76e264fd99bfe93b98bbfaefd3484bd03e811..c65e8987ef3092075ea4c202718dd7e87f39c618 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
-       $user = get_loggedin_user();
+       $user = elgg_get_logged_in_user_entity();
        foreach($vars['invitations'] as $group)
                if ($group instanceof ElggGroup) {
                
index b88c93ad12605cfbfb8075e44502b86be826b9c9..bd7560bb8bce362766b579778e107d3dd7f1644f 100644 (file)
@@ -5,7 +5,7 @@
  * @uses $vars['entity']
  */
 
-if (!isloggedin()) {
+if (!elgg_is_logged_in()) {
        return true;
 }
 
index f8010371120e262213051d6fb821d52fe9ddf1e6..24526d3781ca86b3259fdfaf690efb9d4ef62eac 100644 (file)
@@ -9,7 +9,7 @@
 <p class="mtm">
 <?php 
 echo elgg_echo('groups:closedgroup');
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        echo ' ' . elgg_echo('groups:closedgroup:request');
 }
 ?>
index 99eb13a112ee0fdfa2c9729a58aded1149e9dd05..0ae2bef6350d411a1f63deb6edca7b4dfa672c76 100644 (file)
@@ -1,8 +1,8 @@
 <ul class="submenu page_navigation">
 <?php
-       if(isloggedin()){
-               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/member/{get_loggedin_user()->username}\">". elgg_echo('groups:yours') ."</a></li>";
-               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/invitations/{get_loggedin_user()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
+       if(elgg_is_logged_in()){
+               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/member/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:yours') ."</a></li>";
+               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/invitations/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
        }
 ?>
 </ul>
\ No newline at end of file
index 75311071c10984191ae5623a5f12c3d3c6d28e10..1a8956419b352b099c624858f06efa445eb7ff24 100644 (file)
@@ -21,7 +21,7 @@ if (!is_array($emails) || count($emails) == 0) {
        forward(REFERER);
 }
 
-$current_user = get_loggedin_user();
+$current_user = elgg_get_logged_in_user_entity();
 
 $error = FALSE;
 $bad_emails = array();
index f3e4a0baa60a80dcdde33f5a82c99e9be8d5f369..1b1b0a0ed8ee672fbcef4a45d9ff2791f643a541 100644 (file)
@@ -30,7 +30,7 @@ function invitefriends_page_handler($page) {
        gatekeeper();
 
        elgg_set_context('friends');
-       set_page_owner(get_loggedin_userid());
+       set_page_owner(elgg_get_logged_in_user_guid());
 
        $title = elgg_echo('friends:invite');
 
index 77f638bb1d7fd2d7319a8e1e768277ed01ba624c..1058482d99356e305d0deb8ff8f3d9ccf2c9d058 100644 (file)
@@ -14,7 +14,7 @@ $user = get_entity($page_owner); // the message board owner's details
 // Let's see if we can get a user entity from the specified page_owner
 if ($user && !empty($message_content)) {
 
-       if (messageboard_add(get_loggedin_user(), $user, $message_content, $user->access_id)) {
+       if (messageboard_add(elgg_get_logged_in_user_entity(), $user, $message_content, $user->access_id)) {
                system_message(elgg_echo("messageboard:posted"));
        } else {
                register_error(elgg_echo("messageboard:failure"));
index 008c6fe0f1f8b6f7df23dabdc1fa4071696c405f..4509c30ef13a90dab0c57d0d1eff22c2d86f9835 100644 (file)
@@ -21,7 +21,7 @@ $user = get_entity(get_input('pageOwner'));
 //stage one - if a message was posted, add it as an annotation    
 if ($message) {
 
-       if (!messageboard_add(get_loggedin_user(), $user, $message, $user->access_id)) {
+       if (!messageboard_add(elgg_get_logged_in_user_entity(), $user, $message, $user->access_id)) {
                echo elgg_echo("messageboard:failure");
        }
 
index ca0584cccb5d4b215d409afd7ae2917d1973eccd..648e45a784976d17b2d7a776a301cdb7648614a0 100644 (file)
@@ -11,7 +11,7 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Get the user who is the owner of the message board
-$current_user = get_loggedin_userid();
+$current_user = elgg_get_logged_in_user_guid();
 
 // this is the user how has posted on your messageboard that you want to display your history with
 $history_user = get_input('user'); 
index c6d6bed7a43c4a951ff550c05abe5e96f210e345..102959e248989ac297a46ec74088944466390016 100644 (file)
@@ -20,7 +20,7 @@ $contents = $entity->getAnnotations('messageboard', 50, 0, 'desc');
 $area2 = elgg_view_title(elgg_echo('messageboard:board'));
 
 // only display the add form and board to logged in users
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        $area2 .= elgg_view("messageboard/forms/add");
        $area2 .= elgg_view("messageboard/messageboard", array('annotation' => $contents));
 }
index b6307f33bfe64ce6be6be8f90d95261b1f47b968..abd81d0adc521cdf87a027b851bc3c59b1129588 100644 (file)
@@ -43,7 +43,7 @@
                <?php
                // If the message being looked at is owned by the current user, don't show the reply
                // Also do not show if the user is not logged in
-               if (isloggedin() && $vars['annotation']->owner_guid != get_loggedin_userid()) {
+               if (elgg_is_logged_in() && $vars['annotation']->owner_guid != elgg_get_logged_in_user_guid()) {
 
                        //get the message owner
                        $msg_owner = get_entity($vars['annotation']->owner_guid);
index 71315a526f8f4ca4aa0f509a43e0c8c321190836..a81a99b44d63151ab247d8c7495a8ad1a44f2c92 100644 (file)
@@ -17,7 +17,7 @@ if (isset($vars['entity']->num_display)) {
 }
 
 //Just the loggedin user can post messages
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
 ?>
 <script type="text/javascript">
        $(document).ready(function(){
@@ -62,7 +62,7 @@ if (isloggedin()) {
 </div><!-- end of mb_input_wrapper div -->
 
        <?php
-} //   if(isloggedin())
+} //   if(elgg_is_logged_in())
 
 //this for the first time the page loads, grab the latest messages.
 $contents = $user->getAnnotations('messageboard', $num_display, 0, 'desc');
index f6bac606d30c8e895e55472e69829cbc11d72d02..a643b44b483ece0e665af6f6c1bfb35528857b02 100644 (file)
@@ -43,4 +43,4 @@ elgg_clear_sticky_form('messages');
        
 system_message(elgg_echo("messages:posted"));
 
-forward('pg/messages/inbox/' . get_loggedin_user()->username);
+forward('pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username);
index 84ec7e1248bef086c07b4d426a2864f51b4c5299..561eaa3ce1dab0baa8009a4ffd8c3dbc3b73a2f7 100644 (file)
@@ -37,7 +37,7 @@ if ($inbox) {
        $body_params = array('message' => $message);
        $content .= elgg_view_form('messages/reply', $form_params, $body_params);
 
-       if (get_loggedin_userid() == elgg_get_page_owner_guid()) {
+       if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
                $buttons = elgg_view('output/url', array(
                        'text' => elgg_echo('messages:answer'),
                        'class' => 'elgg-action-button',
index 1f31e9e0277a377cc4bc5337c7a23002643cb253..884c20ccaa69c0a38b2db04b568a8aba4aaf3714 100644 (file)
@@ -7,7 +7,7 @@
 
 gatekeeper();
 
-$page_owner = get_loggedin_user();
+$page_owner = elgg_get_logged_in_user_entity();
 set_page_owner($page_owner->getGUID());
 
 $title = elgg_echo('messages:add');
index a36bbc6216b866cb940a11a9d47d4d8762a5816d..c1693bbcc4c6355421a65c5743e90fb844c7acc7 100644 (file)
@@ -15,17 +15,17 @@ function messages_init() {
        elgg_register_library('elgg:messages', elgg_get_plugins_path() . 'messages/lib/messages.php');
 
        // add page menu items
-       if (isloggedin()) {
+       if (elgg_is_logged_in()) {
                elgg_register_menu_item('page', array(
                        'name' => 'messages:inbox',
                        'title' => elgg_echo('messages:inbox'),
-                       'url' => "pg/messages/inbox/" . get_loggedin_user()->username,
+                       'url' => "pg/messages/inbox/" . elgg_get_logged_in_user_entity()->username,
                        'context' => 'messages',
                ));
                elgg_register_menu_item('page', array(
                        'name' => 'messages:sentmessages',
                        'title' => elgg_echo('messages:sentmessages'),
-                       'url' => "pg/messages/sent/" . get_loggedin_user()->username,
+                       'url' => "pg/messages/sent/" . elgg_get_logged_in_user_entity()->username,
                        'context' => 'messages',
                ));
        }
@@ -75,7 +75,7 @@ function messages_page_handler($page) {
 
        elgg_load_library('elgg:messages');
 
-       elgg_push_breadcrumb(elgg_echo('messages'), 'pg/messages/inbox/' . get_loggedin_user()->username);
+       elgg_push_breadcrumb(elgg_echo('messages'), 'pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username);
 
        if (!isset($page[0])) {
                $page[0] = 'inbox';
@@ -89,7 +89,7 @@ function messages_page_handler($page) {
        }
 
        if (!isset($page[1])) {
-               $page[1] = get_loggedin_user()->username;
+               $page[1] = elgg_get_logged_in_user_entity()->username;
        }
 
        $base_dir = elgg_get_plugins_path() . 'messages';
@@ -207,7 +207,7 @@ function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify
 
        // If $from == 0, set to current user
        if ($from == 0) {
-               $from = (int) get_loggedin_userid();
+               $from = (int) elgg_get_logged_in_user_guid();
        }
 
        // Initialise 2 new ElggObject
@@ -262,17 +262,17 @@ function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify
        }
 
        $message_contents = strip_tags($body);
-       if ($send_to != get_loggedin_user() && $notify) {
+       if ($send_to != elgg_get_logged_in_user_entity() && $notify) {
                $subject = elgg_echo('messages:email:subject');
                $body = elgg_echo('messages:email:body', array(
-                       get_loggedin_user()->name,
+                       elgg_get_logged_in_user_entity()->name,
                        $message_contents,
                        elgg_get_site_url() . "pg/messages/inbox/" . $user->username,
-                       get_loggedin_user()->name,
-                       elgg_get_site_url() . "pg/messages/compose?send_to=" . get_loggedin_userid()
+                       elgg_get_logged_in_user_entity()->name,
+                       elgg_get_site_url() . "pg/messages/compose?send_to=" . elgg_get_logged_in_user_guid()
                ));
 
-               notify_user($send_to, get_loggedin_userid(), $subject, $body);
+               notify_user($send_to, elgg_get_logged_in_user_guid(), $subject, $body);
        }
 
        $messagesendflag = 0;
@@ -299,11 +299,11 @@ function messages_count_unread() {
 
        $options = array(
                'metadata_name_value_pairs' => array(
-                       'toId' => get_loggedin_userid(),
+                       'toId' => elgg_get_logged_in_user_guid(),
                        'readYet' => 0,
                        'msg' => 1
                ),
-               'owner_guid' => get_loggedin_userid()
+               'owner_guid' => elgg_get_logged_in_user_guid()
        );
        $num_messages = elgg_get_entities_from_metadata($options);
 
@@ -348,7 +348,7 @@ function messages_site_notify_handler(ElggEntity $from, ElggUser $to, $subject,
 function messages_user_hover_menu($hook, $type, $return, $params) {
        $user = $params['entity'];
 
-       if (isloggedin() && get_loggedin_userid() != $user->guid) {
+       if (elgg_is_logged_in() && elgg_get_logged_in_user_guid() != $user->guid) {
                $url = "pg/messages/compose?send_to={$user->guid}";
                $item = new ElggMenuItem('send', elgg_echo('messages:sendmessage'), $url);
                $item->setSection('action');
index 20c2f4396ff0bdfa84730e1b94ce5655f4a06c3b..b859b3aee1f456b967f3903d785d4f11a534cb73 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggMessages
  */
 
-if (!isloggedin()) {
+if (!elgg_is_logged_in()) {
        return true;
 }
 
@@ -20,7 +20,7 @@ if ($num_messages != 0) {
 }
 
 echo elgg_view('output/url', array(
-       'href' => 'pg/messages/inbox/' . get_loggedin_user()->username,
+       'href' => 'pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username,
        'text' => $text,
        'class' => $class,
 ));
index f39beb665ab7fd7bec1b12494863887f16fc0cfe..c304cb856a1a01c2a59f4de6c35b91d2975b12ae 100644 (file)
@@ -11,7 +11,7 @@ global $NOTIFICATION_HANDLERS;
 
 // Get group memberships and condense them down to an array of guids
 $groups = array();
-if ($groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 9999))) {
+if ($groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 9999))) {
        foreach($groupmemberships as $groupmembership) {
                $groups[] = $groupmembership->guid;
        }
@@ -24,9 +24,9 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
        if (!empty($groups)) {
                foreach($groups as $group) {
                        if (in_array($group,$subscriptions[$method])) {
-                               add_entity_relationship(get_loggedin_userid(), 'notify'.$method, $group);
+                               add_entity_relationship(elgg_get_logged_in_user_guid(), 'notify'.$method, $group);
                        } else {
-                               remove_entity_relationship(get_loggedin_userid(), 'notify'.$method, $group);
+                               remove_entity_relationship(elgg_get_logged_in_user_guid(), 'notify'.$method, $group);
                        }
                }
        }
index eddda9dc6914f651a699ee406023983792f6dbd8..163b656aa2ef4b6d77789569ed14c4d71922203b 100644 (file)
@@ -6,7 +6,7 @@
  * @package ElggNotifications
  */
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 global $NOTIFICATION_HANDLERS;
 foreach($NOTIFICATION_HANDLERS as $method => $foo) {
index c4f59c049e799f3969163e1ed222c1b9e5400452..a3d7b3cadf001887e6b4330c77fb4fa905160a28 100644 (file)
@@ -11,7 +11,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
 // Ensure only logged-in users can see this page
 gatekeeper();
 
-set_page_owner(get_loggedin_userid());
+set_page_owner(elgg_get_logged_in_user_guid());
 
 // Set the context to settings
 elgg_set_context('settings');
@@ -21,7 +21,7 @@ $title = elgg_echo('notifications:subscriptions:changesettings:groups');
 // Get the form
 $people = array();
 
-$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 9999));
+$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 9999));
 
 $form_body = elgg_view('notifications/subscriptions/groupsform',array('groups' => $groupmemberships));
 $body = elgg_view('input/form',array(
index 4536b8788299c5e365b8d380556d32980217d632..a0235632d619ac7c7ae4e65c4fde2f67114beeb8 100644 (file)
@@ -11,7 +11,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
 // Ensure only logged-in users can see this page
 gatekeeper();
 
-set_page_owner(get_loggedin_userid());
+set_page_owner(elgg_get_logged_in_user_guid());
 
 $js_url = elgg_view_get_simplecache_url('js', 'friendsPickerv1');
 elgg_register_js($js_url, 'friendsPicker');
@@ -23,7 +23,7 @@ $title = elgg_echo('notifications:subscriptions:changesettings');
 
 // Get the form
 $people = array();
-if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999))) {
+if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999))) {
        foreach($people_ents as $ent) {
                $people[] = $ent->guid;
        }
index 00e981f7ba1d282ebb56f526656c3a23fc634237..a200a6513b725fe67630ea449e1beeb23935f190 100644 (file)
@@ -64,8 +64,8 @@ function notifications_page_handler($page) {
  *
  */
 function notifications_plugin_pagesetup() {
-       if (elgg_get_context() == "settings" && get_loggedin_userid()) {
-               $user = get_loggedin_user();
+       if (elgg_get_context() == "settings" && elgg_get_logged_in_user_guid()) {
+               $user = elgg_get_logged_in_user_entity();
 
                $params = array(
                        'name' => '2_a_user_notify',
index 55e330cab008a164e40c3e1f98861c3b46b98989..765998e0e7be7514a3ef4cc7a59dbf50ea8acbed 100644 (file)
@@ -42,7 +42,7 @@
        </tr>
 <?php
        $members = array();
-       if ($friends = get_user_friends(get_loggedin_userid(), '', 9999, 0)) {
+       if ($friends = get_user_friends(elgg_get_logged_in_user_guid(), '', 9999, 0)) {
                foreach($friends as $friend) {
                        $members[] = $friend->guid;
                }
@@ -63,7 +63,7 @@
        $i = 0;
        foreach($NOTIFICATION_HANDLERS as $method => $foo) {
                $metaname = 'collections_notifications_preferences_' . $method;
-               if ($collections_preferences = get_loggedin_user()->$metaname) {
+               if ($collections_preferences = elgg_get_logged_in_user_entity()->$metaname) {
                        if (!empty($collections_preferences) && !is_array($collections_preferences)) {
                                $collections_preferences = array($collections_preferences);
                        }
@@ -95,7 +95,7 @@ END;
        @todo
        collections removed from notifications - they are no longer used and will be replaced with shared access collections
        
-       if ($collections = get_user_access_collections(get_loggedin_userid())) {
+       if ($collections = get_user_access_collections(elgg_get_logged_in_user_guid())) {
                foreach($collections as $collection) {
                        $members = get_members_of_access_collection($collection->id, true);
                        $memberno = sizeof($members);
@@ -115,7 +115,7 @@ END;
                        $i = 0;
                        foreach($NOTIFICATION_HANDLERS as $method => $foo) {
                                $metaname = 'collections_notifications_preferences_' . $method;
-                               if ($collections_preferences = get_loggedin_user()->$metaname) {
+                               if ($collections_preferences = elgg_get_logged_in_user_entity()->$metaname) {
                                        if (!empty($collections_preferences) && !is_array($collections_preferences)) {
                                                $collections_preferences = array($collections_preferences);
                                        }
index f0d391d0d05aeb01445753bea5f768f479e845f0..960b024db464148ecfecc45172eddee8d54d9ea0 100644 (file)
 <?php
 
 // Get friends and subscriptions
-$friends = get_user_friends(get_loggedin_userid(),'',9999,0);
+$friends = get_user_friends(elgg_get_logged_in_user_guid(),'',9999,0);
                
 global $NOTIFICATION_HANDLERS;
 foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-       $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999));
+       $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999));
 }
                
 $subs = array();
index b7b43cb66e54cae3f98e8f0133f97576c99f422c..632e34a54ce5a5fddd8c0f831e6127d341ac9b7e 100644 (file)
@@ -7,7 +7,7 @@
 
 global $NOTIFICATION_HANDLERS;
 foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-       $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 99999));
+       $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
        $tmparray = array();
        if ($subsbig[$method]) {
                foreach($subsbig[$method] as $tmpent) {
index ee8d948b92e531f194ae2a79ba061bb8cc438a85..e75bda758b374306508f90e73e8de7397439e242 100644 (file)
@@ -40,7 +40,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 $fields = '';
 $i = 0;
 foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-       if ($notification_settings = get_user_notification_settings(get_loggedin_userid())) {
+       if ($notification_settings = get_user_notification_settings(elgg_get_logged_in_user_guid())) {
                if ($notification_settings->$method) {
                        $personalchecked[$method] = 'checked="checked"';
                } else {
index e8e7a254aa6fb76b5e714232f04dceb1121c9a93..6950d4b2fe3246c4087faf57c0dbd16edb166ae5 100644 (file)
@@ -69,7 +69,7 @@ if ($page->save()) {
        system_message(elgg_echo('pages:saved'));
 
        if ($new_page) {
-               add_to_river('river/object/page/create', 'create', get_loggedin_userid(), $page->guid);
+               add_to_river('river/object/page/create', 'create', elgg_get_logged_in_user_guid(), $page->guid);
        }
 
        forward($page->getURL());
index afda594cb2b41c45572fa39c953656044fd6c5b3..ff5a7831118918d7d8c8b4ad1db9e03bcecc0aa8 100644 (file)
@@ -32,7 +32,7 @@ if (!$content) {
 }
 
 $filter_context = '';
-if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
+if (elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid()) {
        $filter_context = 'mine';
 }
 
index 4a48368ecb4ec0b85b289f1e4a9a47302d06a99d..31288e040aca9db7ed90772b3bea6756550c91e4 100644 (file)
@@ -275,7 +275,7 @@ function pages_container_permission_check($hook, $entity_type, $returnvalue, $pa
 
        if (elgg_get_context() == "pages") {
                if (elgg_get_page_owner_guid()) {
-                       if (can_write_to_container(get_loggedin_userid(), elgg_get_page_owner_guid())) return true;
+                       if (can_write_to_container(elgg_get_logged_in_user_guid(), elgg_get_page_owner_guid())) return true;
                }
                if ($page_guid = get_input('page_guid',0)) {
                        $entity = get_entity($page_guid);
@@ -284,7 +284,7 @@ function pages_container_permission_check($hook, $entity_type, $returnvalue, $pa
                }
                if ($entity instanceof ElggObject) {
                        if (
-                                       can_write_to_container(get_loggedin_userid(), $entity->container_guid)
+                                       can_write_to_container(elgg_get_logged_in_user_guid(), $entity->container_guid)
                                        || in_array($entity->write_access_id,get_access_list())
                                ) {
                                        return true;
index 2a12bce48f5788dba9adec424511ff6ec43757ad..21f7a8c05fedf186724c86f48dadf64dd4c3e749 100644 (file)
@@ -50,7 +50,7 @@ function profile_page_handler($page) {
        }
 
        // short circuit if invalid or banned username
-       if (!$user || ($user->isBanned() && !isadminloggedin())) {
+       if (!$user || ($user->isBanned() && !elgg_is_admin_logged_in())) {
                register_error(elgg_echo('profile:notfound'));
                forward();
        }
index 4edcec8d1023b681f234dc5eccb36e37f3d180ce..e366580047404f99d4a2b52e654f27a7430dc6c7 100755 (executable)
@@ -25,7 +25,7 @@ $actions = elgg_get_array_value('action', $menu, array());
 $admin = elgg_get_array_value('admin', $menu, array());
 
 $profile_actions = '';
-if (isloggedin() && $actions) {
+if (elgg_is_logged_in() && $actions) {
        $profile_actions = '<ul class="elgg-menu">';
        foreach ($actions as $action) {
                $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-action-button')) . '</li>';
@@ -35,7 +35,7 @@ if (isloggedin() && $actions) {
 
 // if admin, display admin links
 $admin_links = '';
-if (isadminloggedin() && get_loggedin_userid() != elgg_get_page_owner_guid()) {
+if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) {
        $admin_links = '<ul class="profile-admin-menu-wrapper">';
        $admin_links .= '<li><a class="elgg-toggle" id="elgg-toggler-admin-menu">Admin options&hellip;</a>';
        $admin_links .= '<ul class="profile-admin-menu" id="elgg-togglee-admin-menu">';
index 7c60cdf228cdcdad18aba0de7bd3a3174aa2f1e0..f0a1b05c8edae0bd6f1852f6009df076a4f28898 100644 (file)
@@ -13,7 +13,7 @@ if ($title && $address) {
 
        $report = new ElggObject;
        $report->subtype = "reported_content";
-       $report->owner_guid = get_loggedin_userid();
+       $report->owner_guid = elgg_get_logged_in_user_guid();
        $report->title = $title;
        $report->address = $address;
        $report->description = $description;
index 360e868f7d451ef72c83c8c8c81e610a0e17b666..e231216cddbc6a2f5ac1df1584d15091db745b70 100644 (file)
@@ -20,7 +20,7 @@ function reportedcontent_init() {
        elgg_extend_view('css/admin', 'reportedcontent/admin_css');
 
        // Extend footer with report content link
-       if (isloggedin()) {
+       if (elgg_is_logged_in()) {
                elgg_extend_view('footer/links', 'reportedcontent/footer_link');
        }
 
@@ -76,7 +76,7 @@ function reportedcontent_user_hover_menu($hook, $type, $return, $params) {
        $name = urlencode($user->name);
        $url = "pg/reportedcontent/add/?address=$profile_url&title=$name";
 
-       if (isloggedin() && get_loggedin_userid() != $user->guid) {
+       if (elgg_is_logged_in() && elgg_get_logged_in_user_guid() != $user->guid) {
                $item = new ElggMenuItem(
                                'reportuser',
                                elgg_echo('reportedcontent:user'),
index c7e37ed36a8e7b9e4bc0493f9e02f0d0c84a5a3d..83076c2822dcb7ebad107b3607b247731875ff89 100644 (file)
@@ -15,7 +15,7 @@ if ($address == "previous") {
 $tags = array();
 $access_id = ACCESS_PRIVATE;
 $shares = array();
-$owner = get_loggedin_user();
+$owner = elgg_get_logged_in_user_entity();
 
 ?>
 <form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="mtm">
index e2c8065dbfb396f39f71def23f3c46220504614b..4a2b15dcd2e24870a934fa27f62d8e0d0b963f51 100644 (file)
@@ -113,7 +113,7 @@ function sitepages_url($expage) {
 function sitepages_page_handler($page) {
 
        // for the owner block.
-       if ($logged_in_guid = get_loggedin_userid()) {
+       if ($logged_in_guid = elgg_get_logged_in_user_guid()) {
                set_page_owner($logged_in_guid);
        }
 
index 10ef62641a6e09152f7c1eb850575803f2e64ccd..95310e1e5ebe9704db504ebebd856123f128741b 100644 (file)
@@ -9,7 +9,7 @@
 $sitepage = sitepages_get_sitepage_object('front');
 
 if ($sitepage) {
-       if (get_loggedin_userid()) {
+       if (elgg_get_logged_in_user_guid()) {
                echo $sitepage->logged_in_content;
        } else {
                echo $sitepage->logged_out_content;
index 181ac55aa59ea5db9a269357523c4edf7f9bca4e..04aa2bc82076c5598f24d374d802c9eb42b84941 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 // Make sure we're logged in (send us to the front page if not)
-if (!isloggedin()) forward();
+if (!elgg_is_logged_in()) forward();
 
 // Get input data
 $body = get_input('new_post_textarea');
index 9b6bf4a99d1e5df377f822854c10212b5de38e50..849433e0f8537ba371162a4c5068bcbc473cb477 100644 (file)
@@ -7,7 +7,7 @@
         */
 
        // Make sure we're logged in (send us to the front page if not)
-               if (!isloggedin()) forward();
+               if (!elgg_is_logged_in()) forward();
 
        // Get input data
                $guid = (int) get_input('thewirepost');
index 64afe1d7cde19453d2ca248bbde732611720f295..a63a101909c4d970a6131472aabeb60d4eadc91f 100644 (file)
@@ -11,7 +11,7 @@
                require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
                
        // If we're not logged in, forward to the front page
-               if (!isloggedin()) forward(); 
+               if (!elgg_is_logged_in()) forward(); 
                
        // choose the required canvas layout and items to display
            $area2 = elgg_view_title(elgg_echo('thewire:add'));
index 7a4b5c93d7465b29a4b9d7f96ef46cb1cbc013f9..05793ed039c02b9501e88a87351111ca36739c43 100644 (file)
@@ -12,7 +12,7 @@
                $area2 = elgg_view_title(elgg_echo("thewire:everyone"));
                
                //add form
-               if (isloggedin()) {
+               if (elgg_is_logged_in()) {
                        $area2 .= elgg_view("thewire/forms/add");
                }
                $offset = (int)get_input('offset', 0);
index d69cbd5cacca935f1eeca64efe3d97597de9a881..7ed43e3bc363308308b77a4726ed73b27a72f161 100644 (file)
        // Get the current page's owner
                $page_owner = elgg_get_page_owner_entity();
                if ($page_owner === false || is_null($page_owner)) {
-                       $page_owner = get_loggedin_user();
+                       $page_owner = elgg_get_logged_in_user_entity();
                        set_page_owner($page_owner->getGUID());
                }
 
        // title
-               if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
+               if (elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid()) {
                        $area2 = elgg_view_title(elgg_echo("thewire:read"));
                } else {
                        $area2 = elgg_view_title(elgg_echo("thewire:user",array($page_owner->name)));
index 1c984d7927261bb164cb542ca04db45d39a0b73d..fea2cf4609b61407ffa0961b9343b446e4e8ca8b 100644 (file)
@@ -101,8 +101,8 @@ function rest_wire_post($username, $text) {
 
                        //add submenu options
                                if (elgg_get_context() == "thewire") {
-                                       if ((elgg_get_page_owner_guid() == get_loggedin_userid() || !elgg_get_page_owner_guid()) && isloggedin()) {
-                                               add_submenu_item(elgg_echo('thewire:read'),"{$base_url}pg/thewire/" . get_loggedin_user()->username);
+                                       if ((elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid() || !elgg_get_page_owner_guid()) && elgg_is_logged_in()) {
+                                               add_submenu_item(elgg_echo('thewire:read'),"{$base_url}pg/thewire/" . elgg_get_logged_in_user_entity()->username);
                                                add_submenu_item(elgg_echo('thewire:everyone'),"{$base_url}mod/thewire/everyone.php");
                                        } 
                                }
@@ -191,7 +191,7 @@ function rest_wire_post($username, $text) {
                        $thewire->subtype = "thewire";
                        
                        // Set its owner to the current user
-                       $thewire->owner_guid = get_loggedin_userid();
+                       $thewire->owner_guid = elgg_get_logged_in_user_guid();
                        
                        // For now, set its access to public (we'll add an access dropdown shortly)
                        $thewire->access_id = $access_id;
index b2a8b65c95e152b5cf7e3819bff6ac3455ae4357..09568a47fe673ff3ea8d26fb615f162f942609af 100644 (file)
@@ -28,7 +28,7 @@ if (isset($vars['entity'])) {
 
                <div class="wire_post_options">
                <?php
-                       if(isloggedin()){
+                       if(elgg_is_logged_in()){
                ?>
                        <a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="elgg-action-button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
                        <?php
index ec1980abc0d31b7dcd96ffe3c556a22bf1cf0ab1..401401171dd5f3b5d7072a86338cb13750cf229a 100644 (file)
@@ -24,7 +24,7 @@ if ($latest_wire) {
 
        echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>";
        echo $content;
-       if ($owner == get_loggedin_userid()) {
+       if ($owner == elgg_get_logged_in_user_guid()) {
                $text = elgg_echo('thewire:update');
                echo "<a class='elgg-action-button update small' href=\"{$url_to_wire}\">$text</a>";
        }
index 14885ffc1c7c05748446e4938d597ba4c180f96e..9f37aa1514e300c5bbcd01ff6302199d3ee63e6b 100644 (file)
@@ -94,7 +94,7 @@ function twitterservice_tweet($hook, $entity_type, $returnvalue, $params) {
        }
        
        // check user settings
-       $user_id = get_loggedin_userid();
+       $user_id = elgg_get_logged_in_user_guid();
        $access_key = get_plugin_usersetting('access_key', $user_id, 'twitterservice');
        $access_secret = get_plugin_usersetting('access_secret', $user_id, 'twitterservice');
        if (!($access_key && $access_secret)) {
index d3083d48f2ce444a838e9c86a03a8558cfc99a81..11afa6671536137806bc0420430c5764865f549d 100644 (file)
@@ -3,7 +3,7 @@
  * 
  */
 
-$user_id = get_loggedin_userid();
+$user_id = elgg_get_logged_in_user_guid();
 $twitter_name = get_plugin_usersetting('twitter_name', $user_id, 'twitterservice');
 $access_key = get_plugin_usersetting('access_key', $user_id, 'twitterservice');
 $access_secret = get_plugin_usersetting('access_secret', $user_id, 'twitterservice');
index 8ec7b6cbd8b0197027a95a3b4f676d64b1b1d747..93d786e226590d89475e399838a6885f1659aad0 100644 (file)
@@ -8,7 +8,7 @@
 
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        forward();
 }
 
index 680a9f2402d95db5860a5736b7f0e3aff4429dee..58544ef497c89b9ecf06a0be99084b4aebf44ef6 100644 (file)
@@ -22,7 +22,7 @@ $friend_guid = (int) get_input('friend_guid', 0);
 $invitecode = get_input('invitecode');
 
 // only logged out people need to register
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        forward();
 }
 
index 0f4b113c5efc1a41b907eee1bfb52b3e200b277c..31cc9087db279ae46d01b7d15e15e0e55594b2c6 100644 (file)
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Set context and title
 elgg_set_context('dashboard');
-elgg_set_page_owner_guid(get_loggedin_userid());
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 $title = elgg_echo('dashboard');
 
 // wrap intro message in a div
index 81fe7b05b276b0ee7ac3d3d0676e5307b0ab42a9..1b7b0288fa91923bb03acd1d98a3c72922000a0b 100644 (file)
@@ -14,7 +14,7 @@ $title = elgg_echo('friends:collections:add');
 $content = elgg_view_title($title);
 
 $content .= elgg_view('forms/friends/edit', array(
-       'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
+       'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
        )
 );
 
index 76ae9d20b7712c3a1ef11007729b35e4b7938fd1..5a32b7f902980377db2a42a6790a8003a66b6d43 100644 (file)
@@ -13,7 +13,7 @@ $title = elgg_echo('friends:collections');
 
 $content = elgg_view_title($title);
 
-$content .= elgg_view_access_collections(get_loggedin_userid());
+$content .= elgg_view_access_collections(elgg_get_logged_in_user_guid());
 
 $body = elgg_view_layout('one_sidebar', array('content' => $content));
 
index 120ad4b57ae455d6bfe9bc7e1e859e970ad8df5c..728df50e1535266ecb4a0c126504dea08c1e631d 100644 (file)
@@ -26,12 +26,12 @@ switch ($page_type) {
        case 'mine':
                $title = elgg_echo('river:mine');
                $page_filter = 'mine';
-               $options['subject_guid'] = get_loggedin_userid();
+               $options['subject_guid'] = elgg_get_logged_in_user_guid();
                break;
        case 'friends':
                $title = elgg_echo('river:friends');
                $page_filter = 'friends';
-               $options['relationship_guid'] = get_loggedin_userid();
+               $options['relationship_guid'] = elgg_get_logged_in_user_guid();
                $options['relationship'] = 'friend';
                break;
        default:
index 2d3edd6958b56dedd0cfd558531993d3b29ac650..e6a5da97b8544d2983df5803b10da6f9ab2f02b1 100644 (file)
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-       set_page_owner(get_loggedin_userid());
+       set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo('usersettings:user');
index 5cb935e07ceeb626ccde2b76aa447188b218a1cc..b7394cbe820ccdbb9283d3867b9a6b68f5edc2f7 100644 (file)
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-       set_page_owner(get_loggedin_userid());
+       set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo("usersettings:statistics");
index ec0786c179385074ef2187c1f66ac3a437c266b7..dcb0266776d35947801bbfb670969f275eb435cd 100644 (file)
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-       set_page_owner(get_loggedin_userid());
+       set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo("usersettings:plugins");
index 1b042f14b013e768e625f7dd825fe3ff048de7d4..d3976ca38a3876681136beec9c433763defc698e 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-elgg_set_page_owner_guid(get_loggedin_userid());
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 
 $params = array(
        'num_columns' => 2,
index 356aa48de90e0756de38b3978d81b480363e1c7b..fd01b47114770dad4a0046c7bef3ee00e0b7d26c 100644 (file)
@@ -4,7 +4,7 @@
  *
  */
 
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        return true;
 }
 
index 9463d5b42461badc28db90d84839ae40e6a25f9d..bfe88a166fdb335d73f6fe30bc2c31dc326b6d5e 100644 (file)
@@ -22,7 +22,7 @@ if (is_array($vars['collection']->members)) {
 echo "<li><h2>";
 
 //as collections are private, check that the logged in user is the owner
-if ($coll->owner_guid == get_loggedin_userid()) {
+if ($coll->owner_guid == elgg_get_logged_in_user_guid()) {
        echo "<div class=\"friends_collections_controls\">";
        echo elgg_view('output/confirmlink', array(
                        'href' => 'action/friends/deletecollection?collection=' . $coll->id,
@@ -35,7 +35,7 @@ echo " (<span id=\"friends_membership_count{$vars['friendspicker']}\">{$count}</
 
 // individual collection panels
 if ($friends = $vars['collection']->entities) {
-       $content = elgg_view('core/friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
+       $content = elgg_view('core/friends/collectiontabs', array('owner' => elgg_get_logged_in_user_entity(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
 
        echo elgg_view('core/friends/picker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
        ?>
@@ -43,7 +43,7 @@ if ($friends = $vars['collection']->entities) {
        <script type="text/javascript">
        $(document).ready(function () {
 
-                       $('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+                       $('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
        });
        </script>
index 6a939aca728414e1bf8184e1b05f0166a2692bcb..c8d0deb67095fc3509b90bffac391e3c68b4403c 100644 (file)
@@ -30,7 +30,7 @@ $(document).ready(function () {
 
        $('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
                // load collection members pane
-               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");
@@ -42,7 +42,7 @@ $(document).ready(function () {
 
        $('a.editmembers<?php echo $friendspicker; ?>').click(function () {
                // load friends picker pane
-               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");
index 5b59c7215204bd7c854913047ad06e1e06411288..209b6de2d6aa6a3e6736983b36f2699e8ac1537e 100644 (file)
@@ -25,7 +25,7 @@ if (!elgg_annotation_exists($guid, 'likes')) {
        );
        $likes_button = elgg_view('output/url', $params);
 } else {
-       $likes = get_annotations($guid, '', '', 'likes', '', get_loggedin_userid());
+       $likes = get_annotations($guid, '', '', 'likes', '', elgg_get_logged_in_user_guid());
        $url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
        $params = array(
                'href' => $url,
index 66fbc505911dec870f9bbe1757b120b229fd1fcb..7c5e9458181f7efec696193414df5d5bfa6e497a 100644 (file)
@@ -8,7 +8,7 @@
 
 $object = $vars['item']->getObjectEntity();
 
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        // comments and non-objects cannot be commented on or liked
        if ($object->getType() == 'object' && $vars['item']->annotation_id == 0) {
                $params = array(
@@ -29,7 +29,7 @@ if (isloggedin()) {
                        );
                        echo elgg_view('output/url', $params);
                } else {
-                       $likes = get_annotations($guid, '', '', 'likes', '', get_loggedin_userid());
+                       $likes = get_annotations($guid, '', '', 'likes', '', elgg_get_logged_in_user_guid());
                        $url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
                        $params = array(
                                'href' => $url,
index 0ee215f9c6284d9f36132d24a32af822913d13e8..06e59dfbb6545959588ff8cfac4bd21998d5122e 100644 (file)
@@ -17,7 +17,7 @@ if ($user) {
        <div class="elgg-body">
                <?php
                        // only make the admin user enter current password for changing his own password.
-                       if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+                       if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
                ?>
                <p>
                <?php echo elgg_echo('user:current_password:label'); ?>:
index 388af0af68c7fbde9e782aa87b35f3225f03fe50..245fd67be7ff6f4aa8f7e2d93180b073bca9d724 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 // Get entity statistics
-$entity_stats = get_entity_statistics(get_loggedin_userid());
+$entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid());
 
 if ($entity_stats) {
 ?>
index df477d87188b85ca2c386750195a4d5f765abcc9..65db42cb1aa3e8ba5a8d6bf08a847ac48c32428f 100644 (file)
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $logged_in = 0;
 $log = get_system_log($user->guid, "login", "", 'user', '', 1);
index 50cc55b50a1b62e6d4f0ca25e48b4d78ffb11b7e..d89e93c2f7d3a2d020b0101b88c5779e51e53ea6 100644 (file)
@@ -18,7 +18,7 @@ $manifest = $details['manifest'];
 
 $user_guid = $details['user_guid'];
 if ($user_guid) {
-       $user_guid = get_loggedin_userid();
+       $user_guid = elgg_get_logged_in_user_guid();
 }
 
 if (elgg_view("usersettings/{$plugin}/edit")) {
index 333179fbb600ca42d981e5a1a8d5bfde57c9b474..faf27e932335ff08ff0d22c620d5145a08e90338 100644 (file)
@@ -22,7 +22,7 @@ $exportable_values = $entity->getExportableValues();
 <h2><?php echo elgg_echo('Entity'); ?></h2>
        <?php
                foreach ($entity as $k => $v) {
-                       if ((in_array($k, $exportable_values)) || (isadminloggedin())) {
+                       if ((in_array($k, $exportable_values)) || (elgg_is_admin_logged_in())) {
 ?>
                        <p class="margin-none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p>
 <?php
index 74ee5ba4b7f9a179b5e9f90765c0b44a25cbb022..238777422ae1d5bcf584ef48f3c7e37b20142829 100644 (file)
@@ -7,7 +7,7 @@
  * @uses $vars['entity']
  */
 
-if (isset($vars['entity']) && isloggedin()) {
+if (isset($vars['entity']) && elgg_is_logged_in()) {
 ?>
 <p class="mbn">
        <label><?php echo elgg_echo("generic_comments:text"); ?></label>
index ee58834357e5938328108a18b881ead2b08354ac..9c44905be0d853d3789c3a5a867caa3fac957944 100644 (file)
@@ -5,7 +5,7 @@
  * @uses $vars['entity']
  */
 
-if (isset($vars['entity']) && isloggedin()) {
+if (isset($vars['entity']) && elgg_is_logged_in()) {
        echo elgg_view('input/text', array('internalname' => 'generic_comment'));
        echo elgg_view('input/hidden', array(
                'internalname' => 'entity_guid',
index 93e2585d893c182f982e6cf10a05c2252e1dc207..b2f4d14f73d930a5d44bbfedc465d7c0752be9ce 100644 (file)
@@ -11,7 +11,7 @@ $email = get_input('e');
 $name = get_input('n');
 
 $admin_option = false;
-if (isadminloggedin() && isset($vars['show_admin'])) {
+if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) {
        $admin_option = true;
 }
 
index efb691551fc54f1f6c21fe7a238be80bab00c3a9..ae00492676ff4c982263878fb77980834a6f7888 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 $admin_option = false;
-if ((get_loggedin_user()->isAdmin()) && ($vars['show_admin'])) {
+if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
        $admin_option = true;
 }
 
index c0bfc4676632deb03d2a3791dcd8f0f5964bc4f8..9d5a862d8d5fe7f3bd23dfb0630a9015359957e9 100644 (file)
@@ -10,7 +10,7 @@
  * @uses $vars['hover']  Display the hover menu? (true)
  */
 
-$user = elgg_get_array_value('entity', $vars, get_loggedin_user());
+$user = elgg_get_array_value('entity', $vars, elgg_get_logged_in_user_entity());
 $size = elgg_get_array_value('size', $vars, 'medium');
 if (!in_array($size, array('topbar', 'tiny', 'small', 'medium', 'large', 'master'))) {
        $size = 'medium';
@@ -37,7 +37,7 @@ $spacer_url = elgg_get_site_url() . '_graphics/spacer.gif';
 $icon_url = $user->getIconURL($size);
 $icon = "<img src=\"$spacer_url\" alt=\"$name\" title=\"$name\" $js style=\"background: url($icon_url) no-repeat;\" />";
 
-$show_menu = $hover && (isadminloggedin() || !$user->isBanned());
+$show_menu = $hover && (elgg_is_admin_logged_in() || !$user->isBanned());
 
 ?>
 <div class="elgg-avatar elgg-avatar-<?php echo $size; ?>">
index 6a82b879e219c837c9a5a66b884b0ff327e440c7..b967a0914542fc5b442f5f7a46ed8e0f8d64f272 100644 (file)
@@ -28,7 +28,7 @@ if ($page_owner instanceof ElggEntity) {
        echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 if ($user instanceof ElggUser) {
        $user_json = array();
index 6ec4ebabecd26ce474ae705673b436ce365a1038..dce4c1632fd9d8ba21c2ee7f6e2bf11a33e4ac25 100644 (file)
@@ -13,7 +13,7 @@ elgg_push_context('owner_block');
 // groups and other users get owner block
 $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
-       ($owner instanceof ElggUser && $owner->getGUID() != get_loggedin_userid())) {
+       ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
        $header = elgg_view_entity($owner, false);
 
index 988606ec187bd6a8c2f04c567b9c72eebe6a25a3..7d38500d7fbb4c7072475588be90c98ca7d1c723 100644 (file)
@@ -30,7 +30,7 @@ $logout = elgg_view('output/url', array(
                        </a>
                </h1>
                <ul class="elgg-menu-user">
-                       <li><?php echo elgg_echo('admin:loggedin', array(get_loggedin_user()->name)); ?></li>
+                       <li><?php echo elgg_echo('admin:loggedin', array(elgg_get_logged_in_user_entity()->name)); ?></li>
                        <li><?php echo $view_site; ?></li>
                        <li><?php echo $logout; ?></li>
                </ul>
index d84c27a63d11db84fccdc52ae6c0e0a7d3573b19..c9f774e72cec19634cceb789b87c4209ae282c28 100644 (file)
@@ -16,8 +16,8 @@ if (isset($vars['filter_override'])) {
 
 $context = elgg_get_array_value('context', $vars, elgg_get_context());
 
-if (isloggedin() && $context) {
-       $username = get_loggedin_user()->username;
+if (elgg_is_logged_in() && $context) {
+       $username = elgg_get_logged_in_user_entity()->username;
        $filter_context = elgg_get_array_value('filter_context', $vars, 'everyone');
 
        // generate a list of default tabs
index b0bab9dc902cc9cdc46bc2809a26b66c7795b46e..f3517e9ad5bd9f17bbb9821af2436e94dc66f47c 100644 (file)
@@ -25,12 +25,12 @@ if ($context) {
        if (isset($vars['buttons'])) {
                $buttons = $vars['buttons'];
        } else {
-               if (isloggedin() && $context) {
+               if (elgg_is_logged_in() && $context) {
                        $owner = elgg_get_page_owner_entity();
                        if (elgg_instanceof($owner, 'group')) {
                                $guid = $owner->getGUID();
                        } else {
-                               $guid = get_loggedin_userid();
+                               $guid = elgg_get_logged_in_user_guid();
                        }
                        $new_link = elgg_get_array_value('new_link', $vars, "pg/$context/add/$guid/");
                        $params = array(
index 25bed11f549ea835dde3c6763b6372404eecaac8..9ceda38e508cb1009fad879599bb24af16f06dbb 100644 (file)
@@ -23,7 +23,7 @@ $name_link = elgg_view('output/url', array(
 echo "<li>$name_link</li>";
 
 // actions
-if (isloggedin() && $actions) {
+if (elgg_is_logged_in() && $actions) {
        echo '<li><ul>';
        foreach ($actions as $menu_item) {
                echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
@@ -41,7 +41,7 @@ if ($main) {
 }
 
 // admin
-if (isadminloggedin() && $admin) {
+if (elgg_is_admin_logged_in() && $admin) {
        echo '<li><ul class="elgg-hover-admin">';
        foreach ($admin as $menu_item) {
                echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
index 6383c2f186fa172eb6f533e71eedc9e7540cc80c..becf4a13ab6b6e12b9296d8ff0d3c17313cc8529 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 $username = $logged_in_user->username;
 
 if (!$page_owner) {
@@ -61,7 +61,7 @@ $title = elgg_echo($type);
 $title = '<div class="content-header-title">' . elgg_view_title($title) . '</div>';
 
 // must be logged in to see any action buttons
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
        // only show the new button when not on the add form.
        // hide the tabs when on the add form.
        if ($filter_context == 'action') {
index 40306fcc3115953a31b7661c577f85124af542d7..6981d7d7a4dd551242fa7adb1f6ccb042e998c43 100644 (file)
@@ -4,7 +4,7 @@
  * The standard elgg top toolbar
  */
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 if (!elgg_instanceof($user, 'user')) {
        // do not show tobpar to logged out users
        return true;
index 3e2b9f433fb806d9fc8609741939d49e21d43fd8..2abc19991f07a57fa7334e51e22da636e5e966a0 100644 (file)
@@ -12,9 +12,9 @@ $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny'));
 
 // Simple XFN
 $rel = '';
-if (get_loggedin_userid() == $user->guid) {
+if (elgg_get_logged_in_user_guid() == $user->guid) {
        $rel = 'rel="me"';
-} elseif (check_entity_relationship(get_loggedin_userid(), 'friend', $user->guid)) {
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $user->guid)) {
        $rel = 'rel="friend"';
 }
 
index d360f209b03a18020d0e4788071f98da9293799a..f955279d016eb4811132499e7386fdbce162d400 100644 (file)
@@ -15,10 +15,10 @@ header("Content-Type: text/xml");
 echo "<?xml version='1.0'?>\n";
 
 if (!$owner = elgg_get_page_owner_entity()) {
-       if (!isloggedin()) {
+       if (!elgg_is_logged_in()) {
                exit;
        } else {
-               $owner = get_loggedin_user();
+               $owner = elgg_get_logged_in_user_entity();
        }
 }