From bd69383898c82bcc615cb73e74b062783dc7fd4b Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Thu, 24 Nov 2016 11:41:28 +0100 Subject: [PATCH] Use api_get_user_id() --- main/social/friends.php | 2 +- main/social/group_add.php | 2 +- main/social/group_edit.php | 2 +- main/social/group_invitation.php | 2 +- main/social/group_topics.php | 2 +- main/social/group_view.php | 2 +- main/social/group_waiting_list.php | 2 +- main/social/groups.php | 2 +- main/social/invitations.php | 2 +- main/social/myfiles.php | 2 +- main/social/profile.php | 8 +++++++- main/social/search.php | 2 +- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/main/social/friends.php b/main/social/friends.php index 841b8105d5..4009529cfe 100755 --- a/main/social/friends.php +++ b/main/social/friends.php @@ -156,7 +156,7 @@ if (count($friends) == 0) { $social_right_content .= ''; $tpl = new Template(get_lang('Social')); -SocialManager::setSocialUserBlock($tpl, $user_id, 'friends'); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'friends'); $tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_right_content', $social_right_content); diff --git a/main/social/group_add.php b/main/social/group_add.php index 49b3298804..15049ae6d4 100755 --- a/main/social/group_add.php +++ b/main/social/group_add.php @@ -47,7 +47,7 @@ $social_menu_block = SocialManager::show_social_menu('group_add'); $social_right_content = $form->returnForm(); $tpl = new Template(null); -SocialManager::setSocialUserBlock($tpl, $user_id, null, null); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), null, null); $tpl->setHelp('Groups'); $tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_right_content', $social_right_content); diff --git a/main/social/group_edit.php b/main/social/group_edit.php index 47186a49f3..7c27abcac1 100755 --- a/main/social/group_edit.php +++ b/main/social/group_edit.php @@ -59,7 +59,7 @@ $social_right_content = $form->returnForm(); $tpl = new Template(get_lang('Edit')); -SocialManager::setSocialUserBlock($tpl, $user_id, 'groups', $group_id); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); $tpl->setHelp('Groups'); $tpl->assign('social_menu_block', $social_left_content); diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index 15c50bdb1e..637c70968f 100755 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -199,7 +199,7 @@ if (is_array($members) && count($members)>0) { } $tpl = new Template(null); -SocialManager::setSocialUserBlock($tpl, $user_id, 'groups', $group_id); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); $social_menu_block = SocialManager::show_social_menu('member_list', $group_id); $tpl->assign('social_menu_block', $social_menu_block); $tpl->setHelp('Groups'); diff --git a/main/social/group_topics.php b/main/social/group_topics.php index 2f67b96315..56095f13bf 100755 --- a/main/social/group_topics.php +++ b/main/social/group_topics.php @@ -218,7 +218,7 @@ $social_menu_block = SocialManager::show_social_menu('member_list', $group_id); $tpl = new Template(null); $tpl->setHelp('Groups'); // Block Social Avatar -SocialManager::setSocialUserBlock($tpl, $user_id, 'groups', $group_id); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); $tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_friend_block', $friend_html); $tpl->assign('group_message', $group_message); diff --git a/main/social/group_view.php b/main/social/group_view.php index 30223d091f..7398974af5 100644 --- a/main/social/group_view.php +++ b/main/social/group_view.php @@ -321,7 +321,7 @@ if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) { $tpl = new Template(null); // Block Social Avatar -SocialManager::setSocialUserBlock($tpl, $user_id, 'groups', $group_id); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); //Block Social Menu $social_menu_block = SocialManager::show_social_menu('groups', $group_id); $tpl->setHelp('Groups'); diff --git a/main/social/group_waiting_list.php b/main/social/group_waiting_list.php index 78af932734..2f210cac0a 100755 --- a/main/social/group_waiting_list.php +++ b/main/social/group_waiting_list.php @@ -112,7 +112,7 @@ if (empty($new_member_list) > 0) { $tpl = new Template(null); -SocialManager::setSocialUserBlock($tpl, $user_id, 'groups', $group_id); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); $social_menu_block = SocialManager::show_social_menu('member_list', $group_id); $tpl->assign('social_menu_block', $social_menu_block); $tpl->setHelp('Groups'); diff --git a/main/social/groups.php b/main/social/groups.php index 6f0f6c091d..942912df9a 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -280,7 +280,7 @@ $social_right_content .= Display::tabs($headers, array($newest_content, $popular $tpl = new Template(null); // Block Social Avatar -SocialManager::setSocialUserBlock($tpl, $user_id, $show_menu); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), $show_menu); $show_menu = 'browse_groups'; if (isset($_GET['view']) && $_GET['view'] == 'mygroups') { $show_menu = $_GET['view']; diff --git a/main/social/invitations.php b/main/social/invitations.php index 1a9f152d3f..f503f018f2 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -233,7 +233,7 @@ if (count($pending_invitations) > 0) { } $tpl = new Template(null); -SocialManager::setSocialUserBlock($tpl, $user_id, 'invitations'); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'invitations'); $tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_invitations_block',$socialInvitationsBlock); $tpl->assign('content', $content); diff --git a/main/social/myfiles.php b/main/social/myfiles.php index 19938471b7..3d504fcfa5 100755 --- a/main/social/myfiles.php +++ b/main/social/myfiles.php @@ -103,7 +103,7 @@ if (isset($_GET['cidReq'])) { ) . ''; } $tpl = new Template(); -SocialManager::setSocialUserBlock($tpl, $user_id, 'myfiles'); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'myfiles'); $editor = new \Chamilo\CoreBundle\Component\Editor\Editor(); $editor = $tpl->fetch('default/'.$editor->getEditorStandAloneTemplate()); diff --git a/main/social/profile.php b/main/social/profile.php index 13a513e881..ed3d24ea2a 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -678,7 +678,13 @@ if ($show_full_profile) { $tpl = new Template(get_lang('Social')); // Block Avatar Social -SocialManager::setSocialUserBlock($tpl, $user_id, 'shared_profile', 0, $show_full_profile); +SocialManager::setSocialUserBlock( + $tpl, + api_get_user_id(), + 'shared_profile', + 0, + $show_full_profile +); $tpl->assign('social_friend_block', $friend_html); $tpl->assign('social_menu_block', $social_menu_block); diff --git a/main/social/search.php b/main/social/search.php index e751b094f4..831255f58f 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -235,7 +235,7 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) $tpl = new Template($tool_name); // Block Social Avatar -SocialManager::setSocialUserBlock($tpl, $user_id, 'search'); +SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'search'); $tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_search', $block_search); $tpl->assign('search_form', $searchForm);