Move function to SocialManager

main/inc/lib/display.lib.php

@@ -2042,31 +2042,4 @@ class Display
         return $editProfileUrl;
     }
 
-    /**
-     * Generate the social block for a user
-     * @param int $userId The user id
-     * @param string $groupBlock Optional. Highlight link possible values: group_add, home, messages, messages_inbox,
-     *                          messages_compose ,messages_outbox ,invitations, shared_profile, friends, groups search
-     * @param int $groupId Optional. Group ID
-     * @return string The HTML code with the social block
-     */
-    public static function getSocialUserBlock($userId, $groupBlock = '', $groupId = 0)
-    {
-        $userInfo = api_get_user_info($userId);
-        $socialAvarBlock = SocialManager::show_social_avatar_block($groupBlock, $groupId, $userId);
-
-        $profileEditionLink = null;
-
-        if (api_get_user_id() == $userId) {
-            $profileEditionLink = Display::getProfileEditionLink($userId);
-        }
-
-        $template = new Template();
-        $template->assign('user', $userInfo);
-        $template->assign('socialAvatarBlock', $socialAvarBlock);
-        $template->assign('profileEditionLink', $profileEditionLink);
-
-        return $template->fetch('default/social/user_block.tpl');
-    }
-
 }

main/inc/lib/social.lib.php

@@ -1520,4 +1520,31 @@ class SocialManager extends UserManager
         return Database::query($sql);
     }
 
+    /**
+     * Generate the social block for a user
+     * @param int $userId The user id
+     * @param string $groupBlock Optional. Highlight link possible values: group_add, home, messages, messages_inbox,
+     *                          messages_compose ,messages_outbox ,invitations, shared_profile, friends, groups search
+     * @param int $groupId Optional. Group ID
+     * @return string The HTML code with the social block
+     */
+    public static function getSocialUserBlock($userId, $groupBlock = '', $groupId = 0)
+    {
+        $userInfo = api_get_user_info($userId);
+        $socialAvarBlock = SocialManager::show_social_avatar_block($groupBlock, $groupId, $userId);
+
+        $profileEditionLink = null;
+
+        if (api_get_user_id() == $userId) {
+            $profileEditionLink = Display::getProfileEditionLink($userId);
+        }
+
+        $template = new Template();
+        $template->assign('user', $userInfo);
+        $template->assign('socialAvatarBlock', $socialAvarBlock);
+        $template->assign('profileEditionLink', $profileEditionLink);
+
+        return $template->fetch('default/social/user_block.tpl');
+    }
+
 }

main/messages/inbox.php

@@ -131,7 +131,7 @@ $userInfo    = UserManager::get_user_info_by_id($user_id);
 //LEFT CONTENT
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, 'messages');
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'messages');
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu('messages');
 }

main/messages/new_message.php

@@ -312,7 +312,7 @@ $social_left_content = null;
 $userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, 'messages');
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'messages');
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu('messages');
     $social_right_content .= '<div class="span9">';

main/messages/outbox.php

@@ -111,7 +111,7 @@ $social_right_content = '';
 $userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, 'messages');
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'messages');
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu('messages');
     $social_right_content .= '<div class="span9">';

main/messages/view_message.php

@@ -56,7 +56,7 @@ $message  = '';
 $userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, $show_menu);
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, $show_menu);
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu($show_menu);
     $message .='<div class="span9">';

main/social/friends.php

@@ -82,7 +82,7 @@ $interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNet
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Friends'));
 //Block Social Avatar
 $user_info    = UserManager::get_user_info_by_id($user_id);
-$social_avatar_block = Display::getSocialUserBlock($user_id, 'friends');
+$social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'friends');
 //Block Social Menu
 $social_menu_block = SocialManager::show_social_menu('friends');
 

main/social/groups.php

@@ -221,7 +221,7 @@ $create_thread_link = '';
 $userInfo = api_get_user_info(api_get_user_id(), true);
 if ($group_id != 0) {
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, 'groups', $group_id);
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'groups', $group_id);
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu('groups', $group_id);
 } else {
@@ -230,7 +230,7 @@ if ($group_id != 0) {
         $show_menu = $_GET['view'];
     }
     //Block Social Avatar
-    $social_avatar_block = Display::getSocialUserBlock($user_id, $show_menu, $group_id);
+    $social_avatar_block = SocialManager::getSocialUserBlock($user_id, $show_menu, $group_id);
     $social_menu_block = SocialManager::show_social_menu($show_menu, $group_id);
 }
 

main/social/home.php

@@ -83,7 +83,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
     }
 }
 
-$social_avatar_block = Display::getSocialUserBlock(api_get_user_id(), 'home');
+$social_avatar_block = SocialManager::getSocialUserBlock(api_get_user_id(), 'home');
 //Block Menu
 $social_menu_block = SocialManager::show_social_menu('home');
 

main/social/invitations.php

@@ -94,7 +94,7 @@ if (is_array($_GET) && count($_GET)>0) {
 //Block Avatar Social
 $userInfo    = UserManager::get_user_info_by_id($user_id);
 
-$social_avatar_block = Display::getSocialUserBlock($user_id, invitations);
+$social_avatar_block = SocialManager::getSocialUserBlock($user_id, invitations);
 //Block Menu Social
 $social_menu_block = SocialManager::show_social_menu('invitations');
 //Block Invitations

main/social/myfiles.php

@@ -131,7 +131,7 @@ if (is_array($_GET) && count($_GET) > 0) {
 }
 //Social Avatar BLock
 $user_info    = UserManager::get_user_info_by_id($user_id);
-$social_avatar_block = Display::getSocialUserBlock($user_id, 'myfiles');
+$social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'myfiles');
 //Social Menu Block
 $social_menu_block = SocialManager::show_social_menu('myfiles');
 $actions = null;

main/social/profile.php

@@ -375,7 +375,7 @@ if (is_array($personal_course_list)) {
     $course_list_code = array_unique_dimensional($course_list_code);
 }
 //Block Avatar Social
-$social_avatar_block = Display::getSocialUserBlock($user_id, 'shared_profile');
+$social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'shared_profile');
 //Social Block Menu
 $social_menu_block = SocialManager::show_social_menu('shared_profile', null, $user_id, $show_full_profile);
 

main/social/search.php

@@ -148,7 +148,7 @@ if (!empty($extra_fields)) {
 }
 $user_info    = UserManager::get_user_info_by_id($user_id);
 //Block Social Avatar
-$social_avatar_block = Display::getSocialUserBlock($user_id, 'search');
+$social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'search');
 //Block Social Menu
 $social_menu_block = SocialManager::show_social_menu('search');
 $social_right_content = '<div class="span9">'.UserManager::get_search_form($query).'</div>';