chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r18879] logic changes - allow view shared profile - (partial FS#3751)

Browse Source
skala
Julio Montoya 17 years ago
parent 917876aa46
commit 1af0369f4d
2 changed files with 75 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 35
      main/social/data_personal.inc.php
  2. 77
      main/social/profile.php

35
main/social/data_personal.inc.php
Unescape View File

@ -50,28 +50,33 @@ if (isset($_POST['load_ajax'])) {
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY,$course_db);
$table_users = Database :: get_main_table(TABLE_MAIN_USER);
//------Forum messages
echo '<div class="rounded social-profile-post" style="background:#FAF9F6; padding:0px;" >';
get_all_post_from_user($user_id, $course_db);
echo '</div>';
echo '<br />';
//------Blog posts
api_display_tool_title(get_lang('BlogPosts'));
echo '<div class="rounded social-profile-post" style="background:#FAF9F6; padding:0px;">';
get_blog_post_from_user($course_db, $user_id);
echo '</div>';
echo '<br />';
//------Blog comments
api_display_tool_title(get_lang('BlogComments'));
echo '<div class="rounded social-profile-post " style="background:#FAF9F6; padding:0px;" >';
get_blog_comment_from_user($course_db, $user_id);
echo '</div>';
echo '<br />';
$result = get_blog_post_from_user($course_db, $user_id);
if (!empty($result)) {
api_display_tool_title(get_lang('BlogPosts'));
echo '<div class="rounded social-profile-post" style="background:#FAF9F6; padding:0px;">';
echo $result;
echo '</div>';
echo '<br />';
}
break;
//------Blog comments
$result = get_blog_comment_from_user($course_db, $user_id);
if (!empty($result)) {
api_display_tool_title(get_lang('BlogComments'));
echo '<div class="rounded social-profile-post" style="background:#FAF9F6; padding:0px;">';
echo $result;
echo '</div>';
echo '<br />';
}
break;
case 'unload_course' :
//echo 'load2';
break;
@ -107,7 +112,5 @@ if (isset($_POST['load_ajax'])) {
echo '</dl>';
echo '</div>';
echo '</div>';
}
?>

77
main/social/profile.php
Unescape View File

@ -410,9 +410,9 @@ echo $s="<script>$(document).ready( function(){
$('.rounded').corners();
});</script>";
echo '<div id="actions">';
//echo '<div id="actions">';
//echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>';
echo '</div>';
//echo '</div>';
//Setting some course info
$personal_course_list = UserManager::get_personal_session_course_list($_user['user_id']);
@ -458,14 +458,15 @@ echo '<div id="social-profile-wrapper">';
$j=0;
$friend_html.= '<div id="friend-container">';
api_display_tool_title(get_lang('Friends'));
$friend_html.= '<div id="friend-header">';
//$friend_html.= $friends_count.' '.get_lang('Friends');
if ($friends_count == 1)
$friend_html.= '<div style="float:left;">'.$friends_count.' '.get_lang('Friend').'</div>';
else
$friend_html.= '<div style="float:left;">'.$friends_count.' '.get_lang('Friends').'</div>';
$friend_html.= '<div style="float:right;">'.get_lang('SeeAll').'</div>';
$friend_html.= '</div><br/>'; // close div friend-header
$friend_html.= '<div id="friend-header">';
//$friend_html.= $friends_count.' '.get_lang('Friends');
if ($friends_count == 1)
$friend_html.= '<div style="float:left;">'.$friends_count.' '.get_lang('Friend').'</div>';
else $friend_html.= '<div style="float:left;">'.$friends_count.' '.get_lang('Friends').'</div>';
$friend_html.= '<div style="float:right;">'.get_lang('SeeAll').'</div>';
$friend_html.= '</div><br/>';
for ($k=0;$k<$loop_friends;$k++) {
if ($j==$number_of_images) {
@ -476,7 +477,7 @@ echo '<div id="social-profile-wrapper">';
$my_user_info=api_get_user_info($list_friends_id[$j]);
$name_user=$my_user_info['firstName'].' '.$my_user_info['lastName'];
//class="image-social-content"
$friend_html.='&nbsp;<div id=div_'.$list_friends_id[$j].' style="float:left" >';
$friend_html.='&nbsp;<div id=div_'.$list_friends_id[$j].' style="float:left;" >';
$margin_top = 10;
if ($k==0) $margin_top = 0;
$friend_html.='<a href="profile.php?u='.$list_friends_id[$j].'">';
@ -488,48 +489,62 @@ echo '<div id="social-profile-wrapper">';
$j++;
}
}
$friend_html.='</div>';
//$friend_html.='</div>'; // close the div friend-container
}
$friend_html.= '</div>';
echo $friend_html;
echo '<div class="clear"></div><br />';
api_display_tool_title(get_lang('PendingInvitations'));
//Pending invitations
$pending_invitations = UserFriend::get_list_invitation_of_friends_by_user_id($user_id);
$list_get_path_web=UserFriend::get_list_web_path_user_invitation_by_user_id($user_id);
$count_pending_invitations = count($pending_invitations);
echo '<br/><br/>';
//echo '<div>';
if ($count_pending_invitations > 0) {
api_display_tool_title(get_lang('PendingInvitations'));
for ($i=0;$i<$count_pending_invitations;$i++) {
//var_dump($invitations);
echo '<img src="'.$list_get_path_web[$i]['dir'].'/'.$list_get_path_web[$i]['file'].'" width="60px">';
//echo $pending_invitations[$i]['user_sender_id'];
echo $pending_invitations[$i]['content'];
echo '<br />';
echo '<div style="width:240px;">';
echo '<div style="float:left;width:60px;" >';
echo '<img src="'.$list_get_path_web[$i]['dir'].'/'.$list_get_path_web[$i]['file'].'" width="60px">';
echo '</div>';
echo '<div style="padding-left:70px;">';
echo ' '.substr($pending_invitations[$i]['content'],19);
echo '<br />';
echo '<a href="">'.get_lang('AddToFriends').'</a>';
echo '</div>';
echo '</div>';
//echo '<div class="clear"></div><br />';
}
}
//echo '</div>';
//echo '<div class="clear"></div><br />';
echo '<br />';
//--Productions
api_display_tool_title(get_lang('Productions'));
echo '<div class="rounded1">';
echo UserManager::build_production_list($user_id);
echo '</div>';
$production_list = UserManager::build_production_list($user_id);
if (!empty($production_list )) {
api_display_tool_title(get_lang('Productions'));
echo '<div class="rounded1">';
echo $production_list;
echo '</div>';
}
// Images uploaded by course
api_display_tool_title(get_lang('ImagesUploaded'));
echo '<div class="rounded2">';
$file_list = '';
foreach ($course_list_code as $course) {
echo UserManager::get_user_upload_files_by_course($user_id,$course['code']);
$file_list.= UserManager::get_user_upload_files_by_course($user_id,$course['code']);
}
if (!empty($file_list)) {
api_display_tool_title(get_lang('ImagesUploaded'));
echo '<div class="rounded2">';
echo $file_list;
echo '</div>';
}
echo '</div>';
}
echo '</div>'; // end of content section
// echo '</div>';
echo '<div id="social-profile-container">';

Write Preview
Loading…
Cancel
Save