diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php index 5e29aed2ad..a425051ad1 100644 --- a/public/main/inc/lib/social.lib.php +++ b/public/main/inc/lib/social.lib.php @@ -153,7 +153,7 @@ class SocialManager extends UserManager $tbl_my_user = Database::get_main_table(TABLE_MAIN_USER); $sql = 'SELECT friend_user_id FROM '.$tbl_my_friend.' WHERE - relation_type NOT IN ('.USER_RELATION_TYPE_DELETED.', '.USER_RELATION_TYPE_RRHH.') AND + relation_type NOT IN ('.UserRelUser::USER_RELATION_TYPE_DELETED.', '.UserRelUser::USER_RELATION_TYPE_RRHH.') AND friend_user_id<>'.$user_id.' AND user_id='.$user_id; if (isset($id_group) && $id_group > 0) { diff --git a/public/main/inc/lib/statistics.lib.php b/public/main/inc/lib/statistics.lib.php index dd49bb15ac..a4afee4a47 100644 --- a/public/main/inc/lib/statistics.lib.php +++ b/public/main/inc/lib/statistics.lib.php @@ -2,6 +2,7 @@ /* For licensing terms, see /license.txt */ use Chamilo\CoreBundle\Component\Utils\ChamiloApi; +use Chamilo\CoreBundle\Entity\UserRelUser; /** * This class provides some functions for statistics. @@ -1098,7 +1099,7 @@ class Statistics LEFT JOIN $user_table u ON (uf.user_id = u.id) WHERE - uf.relation_type <> '".USER_RELATION_TYPE_RRHH."' AND + uf.relation_type <> '".UserRelUser::USER_RELATION_TYPE_RRHH."' AND uf.user_id = url.user_id AND access_url_id = '".$urlId."' GROUP BY uf.user_id @@ -1108,7 +1109,7 @@ class Statistics FROM $user_friend_table uf LEFT JOIN $user_table u ON (uf.user_id = u.id) - WHERE uf.relation_type <> '".USER_RELATION_TYPE_RRHH."' + WHERE uf.relation_type <> '".UserRelUser::USER_RELATION_TYPE_RRHH."' GROUP BY uf.user_id ORDER BY count_friend DESC "; } diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php index aee6199114..3e6fa0abed 100644 --- a/public/main/inc/lib/usermanager.lib.php +++ b/public/main/inc/lib/usermanager.lib.php @@ -4494,7 +4494,7 @@ class UserManager return self::subscribeUsersToUser( $hr_dept_id, $users_id, - USER_RELATION_TYPE_RRHH, + UserRelUser::USER_RELATION_TYPE_RRHH, false, $deleteOtherAssignedUsers ); diff --git a/public/main/social/group_add.php b/public/main/social/group_add.php index ad2d5b6887..6af14d91f3 100644 --- a/public/main/social/group_add.php +++ b/public/main/social/group_add.php @@ -45,12 +45,12 @@ $interbreadcrumb[] = ['url' => 'groups.php', 'name' => get_lang('Groups')]; $interbreadcrumb[] = ['url' => '#', 'name' => $nameTools]; $social_avatar_block = SocialManager::show_social_avatar_block('group_add'); -$social_menu_block = SocialManager::show_social_menu('group_add'); +//$social_menu_block = SocialManager::show_social_menu('group_add'); $tpl = new Template(null); SocialManager::setSocialUserBlock($tpl, api_get_user_id(), null, null); $tpl->setHelp('Groups'); -$tpl->assign('social_menu_block', $social_menu_block); +//$tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_right_content', $form->returnForm()); $social_layout = $tpl->get_template('social/add_groups.tpl'); diff --git a/public/main/social/group_edit.php b/public/main/social/group_edit.php index fe944507fe..f25228cd1c 100644 --- a/public/main/social/group_edit.php +++ b/public/main/social/group_edit.php @@ -57,7 +57,7 @@ if ($form->validate()) { exit(); } -$social_left_content = SocialManager::show_social_menu('group_edit', $group_id); +//$social_left_content = SocialManager::show_social_menu('group_edit', $group_id); $social_right_content = $form->returnForm(); $tpl = new Template(get_lang('Edit')); @@ -65,7 +65,7 @@ $tpl = new Template(get_lang('Edit')); SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); $tpl->setHelp('Groups'); -$tpl->assign('social_menu_block', $social_left_content); +//$tpl->assign('social_menu_block', $social_left_content); $tpl->assign('social_right_content', $social_right_content); $social_layout = $tpl->get_template('social/add_groups.tpl'); diff --git a/public/main/social/group_invitation.php b/public/main/social/group_invitation.php index c4aebb0fb4..18badc7c30 100644 --- a/public/main/social/group_invitation.php +++ b/public/main/social/group_invitation.php @@ -199,8 +199,6 @@ if (is_array($members) && count($members) > 0) { $tpl = new Template(null); 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'); $tpl->assign('social_right_content', $social_right_content); $social_layout = $tpl->get_template('social/add_groups.tpl'); diff --git a/public/main/social/group_topics.php b/public/main/social/group_topics.php index 2293937d86..0b4383876d 100644 --- a/public/main/social/group_topics.php +++ b/public/main/social/group_topics.php @@ -182,7 +182,7 @@ $interbreadcrumb[] = ['url' => 'groups.php', 'name' => get_lang('Groups')]; $interbreadcrumb[] = ['url' => 'group_view.php?id='.$group_id, 'name' => Security::remove_XSS($group_info['name'])]; $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Discussions')]; -$social_left_content = SocialManager::show_social_menu('member_list', $group_id); +$social_left_content = null; //SocialManager::show_social_menu('member_list', $group_id); $show_message = null; if (!empty($show_message)) { $social_right_content .= Display::return_message($show_message, 'confirmation'); @@ -194,13 +194,13 @@ $group_message = MessageManager::display_message_for_group( $message_id ); -$social_menu_block = SocialManager::show_social_menu('member_list', $group_id); +//$social_menu_block = SocialManager::show_social_menu('member_list', $group_id); $tpl = new Template(null); $tpl->setHelp('Groups'); // Block Social Avatar SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); -$tpl->assign('social_menu_block', $social_menu_block); +$tpl->assign('social_menu_block', ''); $tpl->assign('social_friend_block', $friend_html); $tpl->assign('group_message', $group_message); $tpl->assign('social_right_content', $social_right_content); diff --git a/public/main/social/group_view.php b/public/main/social/group_view.php index 785bf173f8..ccd8cdc7e9 100644 --- a/public/main/social/group_view.php +++ b/public/main/social/group_view.php @@ -338,13 +338,13 @@ $tpl = new Template(null); // Block Social Avatar SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id); -$social_menu_block = SocialManager::show_social_menu('groups', $group_id); +//$social_menu_block = SocialManager::show_social_menu('groups', $group_id); $tpl->setHelp('Groups'); $tpl->assign('create_link', $create_thread_link); $tpl->assign('is_group_member', $is_group_member); $tpl->assign('group_info', $groupInfo); $tpl->assign('social_friend_block', $friend_html); -$tpl->assign('social_menu_block', $social_menu_block); +//$tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_forum', $socialForum); $tpl->assign('social_right_content', $social_right_content); $tpl->assign('list_members', $listMembers); diff --git a/public/main/social/group_waiting_list.php b/public/main/social/group_waiting_list.php index d6d6f8ff6e..e151fed607 100644 --- a/public/main/social/group_waiting_list.php +++ b/public/main/social/group_waiting_list.php @@ -111,8 +111,7 @@ if (empty($new_member_list) > 0) { $tpl = new Template(null); 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'); $tpl->assign('members', $new_member_list); $tpl->assign('social_right_content', $social_right_content); diff --git a/public/main/social/invitations.php b/public/main/social/invitations.php deleted file mode 100644 index 96a5fa1a36..0000000000 --- a/public/main/social/invitations.php +++ /dev/null @@ -1,241 +0,0 @@ - - */ -$cidReset = true; -require_once __DIR__.'/../inc/global.inc.php'; - -api_block_anonymous_users(); - -if ('true' !== api_get_setting('allow_social_tool')) { - api_not_allowed(true); -} - -$this_section = SECTION_SOCIAL; - -$interbreadcrumb[] = ['url' => 'profile.php', 'name' => get_lang('Social network')]; -$interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Invitations')]; - -$userGroupModel = new UserGroupModel(); - -if (is_array($_GET) && count($_GET) > 0) { - foreach ($_GET as $key => $value) { - switch ($key) { - case 'accept': - $useRole = $userGroupModel->get_user_group_role(api_get_user_id(), $value); - - if (in_array( - $useRole, - [ - GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, - GROUP_USER_PERMISSION_PENDING_INVITATION, - ] - )) { - $userGroupModel->update_user_role(api_get_user_id(), $value, GROUP_USER_PERMISSION_READER); - - Display::addFlash( - Display::return_message(get_lang('User is subscribed to this group'), 'success') - ); - - header('Location: '.api_get_path(WEB_CODE_PATH).'social/invitations.php'); - exit; - } - - if (in_array( - $useRole, - [ - GROUP_USER_PERMISSION_READER, - GROUP_USER_PERMISSION_ADMIN, - GROUP_USER_PERMISSION_MODERATOR, - ] - )) { - Display::addFlash( - Display::return_message(get_lang('User is already subscribed to this group'), 'warning') - ); - - header('Location: '.api_get_path(WEB_CODE_PATH).'social/invitations.php'); - exit; - } - - Display::addFlash( - Display::return_message(get_lang('User is not subscribed to this group'), 'warning') - ); - - header('Location: '.api_get_path(WEB_CODE_PATH).'social/invitations.php'); - exit; - break; - case 'deny': - $userGroupModel->delete_user_rel_group(api_get_user_id(), $value); - - Display::addFlash( - Display::return_message(get_lang('Group invitation was denied')) - ); - - header('Location: '.api_get_path(WEB_CODE_PATH).'social/invitations.php'); - exit; - } - } -} - -$content = ''; - -// Block Menu Social -$social_menu_block = SocialManager::show_social_menu('invitations'); -// Block Invitations -$socialInvitationsBlock = '
'; - -$user_id = api_get_user_id(); -$list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id); -$list_get_invitation_sent = SocialManager::get_list_invitation_sent_by_user_id($user_id); -$pending_invitations = $userGroupModel->get_groups_by_user( - $user_id, - GROUP_USER_PERMISSION_PENDING_INVITATION -); -$numberLoop = count($list_get_invitation); - -$total_invitations = $numberLoop + count($list_get_invitation_sent) + count($pending_invitations); - -if (count($_GET) <= 0) { - $socialInvitationsBlock .= '
-
- '. - get_lang('Try and find some friends').' - -
-

'; -} - -if (0 != $numberLoop) { - $invitationHtml = ''; - foreach ($list_get_invitation as $invitation) { - $sender_user_id = $invitation['user_sender_id']; - $user_info = api_get_user_info($sender_user_id); - $userPicture = $user_info['avatar']; - $invitationHtml .= '
'; - - $title = Security::remove_XSS($invitation['title'], STUDENT, true); - $content = Security::remove_XSS($invitation['content'], STUDENT, true); - $date = Display::dateToStringAgoAndLongDate($invitation['send_date']); - $invitationHtml .= '
'; - $invitationHtml .= '
'; - $invitationHtml .= ''; - $invitationHtml .= ''; - $invitationHtml .= '
'; - $invitationHtml .= '
'; - - $invitationHtml .= '
'; - $invitationHtml .= '
'; - $invitationHtml .= Display::toolbarButton( - null, - api_get_path(WEB_AJAX_PATH).'social.ajax.php?'.http_build_query([ - 'a' => 'add_friend', - 'friend_id' => $sender_user_id, - 'is_my_friend' => 'friend', - ]), - 'check', - 'primary', - ['id' => 'btn-accept-'.$sender_user_id] - ); - $invitationHtml .= Display::toolbarButton( - null, - api_get_path(WEB_AJAX_PATH).'social.ajax.php?'.http_build_query([ - 'a' => 'deny_friend', - 'denied_friend_id' => $sender_user_id, - ]), - 'times', - 'danger', - ['id' => 'btn-deny-'.$sender_user_id] - ); - $invitationHtml .= '
'; - $invitationHtml .= '
'; - - $invitationHtml .= '
- '.$user_info['complete_name'].': -
'; - $invitationHtml .= '
'.$content.'
'; - $invitationHtml .= '
'.get_lang('Sent').' : '.$date.'
'; - - $invitationHtml .= '
'; - $invitationHtml .= '
'; - } - $socialInvitationsBlock .= Display::panel($invitationHtml, get_lang('Invitation received')); -} - -if (count($list_get_invitation_sent) > 0) { - $invitationSentHtml = ''; - foreach ($list_get_invitation_sent as $invitation) { - $sender_user_id = $invitation['user_receiver_id']; - $user_info = api_get_user_info($sender_user_id); - $invitationSentHtml .= '
'; - $title = Security::remove_XSS($invitation['title'], STUDENT, true); - $content = Security::remove_XSS($invitation['content'], STUDENT, true); - - $invitationSentHtml .= '
'; - $invitationSentHtml .= '
'; - $invitationSentHtml .= ''; - $invitationSentHtml .= ''; - $invitationSentHtml .= '
'; - $invitationSentHtml .= '
'; - $invitationSentHtml .= '

- '.$user_info['complete_name'].'

'; - $invitationSentHtml .= '
'.$title.' : '.$content.'
'; - $invitationSentHtml .= '
'. - get_lang('Sent').' : '.Display::dateToStringAgoAndLongDate($invitation['send_date']).'
'; - $invitationSentHtml .= '
'; - $invitationSentHtml .= '
'; - } - $socialInvitationsBlock .= Display::panel($invitationSentHtml, get_lang('Invitation sent')); -} - -if (count($pending_invitations) > 0) { - $new_invitation = []; - $waitingInvitation = ''; - foreach ($pending_invitations as $invitation) { - $picture = $userGroupModel->get_picture_group( - $invitation['id'], - $invitation['picture'], - null, - GROUP_IMAGE_SIZE_BIG - ); - $img = ''; - $invitation['picture_uri'] = ''.$img.''; - $invitation['name'] = ''. - cut($invitation['name'], 120, true).''; - $invitation['description'] = cut($invitation['description'], 220, true); - $new_invitation[] = $invitation; - $waitingInvitation .= '
'; - $waitingInvitation .= '
'.$invitation['picture_uri'].'
'; - $waitingInvitation .= '
'; - $waitingInvitation .= '

'.$invitation['name'].'

'; - $waitingInvitation .= '
'.$invitation['description'].'
'; - $waitingInvitation .= '
'; - $waitingInvitation .= Display::toolbarButton( - get_lang('Accept invitation'), - api_get_path(WEB_CODE_PATH).'social/invitations.php?'.http_build_query(['accept' => $invitation['id']]), - 'check', - 'success', - ['id' => 'accept-invitation-'.$invitation['id']] - ); - $waitingInvitation .= Display::toolbarButton( - get_lang('Deny invitation'), - api_get_path(WEB_CODE_PATH).'social/invitations.php?'.http_build_query(['deny' => $invitation['id']]), - 'times', - 'danger', - ['id' => 'deny-invitation-'.$invitation['id']] - ); - $waitingInvitation .= '
'; - $waitingInvitation .= '
'; - } - $socialInvitationsBlock .= Display::panel($waitingInvitation, get_lang('Groups waiting for approval')); -} - -$tpl = new Template(null); -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); -$social_layout = $tpl->get_template('social/invitations.tpl'); -$tpl->display($social_layout); diff --git a/public/main/social/new_promoted_message.php b/public/main/social/new_promoted_message.php index 85e32b960b..554098ce12 100644 --- a/public/main/social/new_promoted_message.php +++ b/public/main/social/new_promoted_message.php @@ -219,7 +219,7 @@ $social_right_content = null; $social_left_content = ''; // Block Social Menu -$social_menu_block = SocialManager::show_social_menu('messages'); +//$social_menu_block = SocialManager::show_social_menu('messages'); $social_right_content .= '
'; $social_right_content .= '
'; $social_right_content .= '
'; diff --git a/public/main/social/personal_data.php b/public/main/social/personal_data.php index b1f38d24e5..14966ba632 100644 --- a/public/main/social/personal_data.php +++ b/public/main/social/personal_data.php @@ -231,7 +231,7 @@ $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Personal data')]; $socialMenuBlock = ''; if ($allowSocial) { // Block Social Menu - $socialMenuBlock = SocialManager::show_social_menu('personal-data'); + //$socialMenuBlock = SocialManager::show_social_menu('personal-data'); } // MAIN CONTENT