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

Cleaning more code

Browse Source
skala
Julio Montoya 16 years ago
parent 458c733f62
commit eb87720e04
6 changed files with 19 additions and 94 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. 11
      main/inc/lib/social.lib.php
  2. 23
      main/inc/lib/usermanager.lib.php
  3. 7
      main/social/groups.php
  4. 9
      main/social/invitations.php
  5. 52
      main/social/profile.php
  6. 11
      main/social/show_search_image.inc.php

11
main/inc/lib/social.lib.php
Unescape View File

@ -632,19 +632,20 @@ class SocialManager extends UserManager {
}
public static function show_social_menu() {
echo '<div class="actions">';
/*
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png').' '.get_lang('ViewMySharedProfile').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png').' '.get_lang('Friends').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('lp_users.png').' '.get_lang('Invitations').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif').' '.get_lang('MyGroups').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif').' '.get_lang('Groups').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('EditProfile').'</a>';
/*
echo '<span style="float:right; padding-top:7px;">'.
'<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
'</span>';
*/
echo '</div>';
echo '</div>';*/
}
}

23
main/inc/lib/usermanager.lib.php
Unescape View File

@ -2648,22 +2648,8 @@ class UserManager
*
*/
public function get_search_form($query) {
echo'<form method="get" action="'.api_get_path(WEB_PATH).'main/social/search.php">
<table cellspacing="0" cellpadding="0" id="SearchTable">
<tbody><tr>
<td>
<div id="SearchQueryChunk">
<div id="SearchQueryNav">
<b>Search</b > (Users, Groups)
</div>
<div>
<input type="text" size="30" value="'.Security::remove_XSS($query).'" tabindex="1" id="standard_q" name="q"/>
<button class="search" value="search"/>'.get_lang('Search').'</button>
</div>
</td>
</tr>
</tbody></table></form>';
//Not available yet
return '';
}
//deprecated
public function get_public_users($keyword, $from = 0, $number_of_items= 20, $column=2, $direction='ASC') {
@ -2736,7 +2722,8 @@ class UserManager
}
return $users;
}
function show_menu(){
function show_menu() {
/*
echo '<div class="actions">';
echo '<a href="/main/auth/profile.php">'.Display::return_icon('profile.png').' '.get_lang('PersonalData').'</a>';
echo '<a href="/main/messages/inbox.php">'.Display::return_icon('inbox.png').' '. get_lang('Inbox').'</a>';
@ -2744,6 +2731,6 @@ class UserManager
echo '<span style="float:right; padding-top:7px;">'.
'<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
'</span>';
echo '</div>';
echo '</div>';*/
}
}

7
main/social/groups.php
Unescape View File

@ -58,13 +58,6 @@ if ($group_id != 0 ) {
$users = GroupPortalManager::get_users_by_group($group_id, true);
//@todo this must be move to default.css for dev use only
echo '<style>
#group_members { width:250px; height:300px; overflow-x:none; overflow-y: auto;}
.group_member_item { width:80px; height:100px; float:left; margin:5px 5px 15px 5px; }
</style>';
echo '<div id="layout-left" style="float: left; width: 280px; height: 100%;">';
//Group's title

9
main/social/invitations.php
Unescape View File

@ -80,15 +80,6 @@ $pending_invitations = GroupPortalManager::get_groups_by_user($user_id, GROUP_US
$number_loop=count($list_get_invitation);
//@todo move this to default.css
echo '<style>
.confirm {
border-top:1px solid #D8DFEA;
}
</style>';
if ($number_loop==0) {
Display::display_normal_message(get_lang('NoPendingInvitations'));
} else {

52
main/social/profile.php
Unescape View File

@ -207,7 +207,7 @@ if (isset($_GET['u'])) {
$info_user=api_get_user_info(api_get_user_id());
$param_user='';
}
$_SESSION['social_user_id'] = $user_id;
$_SESSION['social_user_id'] = intval($user_id);
/**
* Display
@ -330,7 +330,6 @@ echo '<div id="social-profile-wrapper">';
}
}
} else {
// No friends!! :(
$friend_html .= '<div class="sectiontitle">'.get_lang('Friends').'</div>';
$friend_html.= '<div id="friend-container" class="social-friend-container">';
$friend_html.= '<div id="friend-header">';
@ -467,17 +466,7 @@ echo '<div id="social-profile-container">';
echo '</div>';
if (api_get_user_id() == $user_id) {
/* // if i'm me
echo '<div>';
echo Display::return_icon('email.gif');
echo '&nbsp;<a href="../social/index.php#remote-tab-2">'.get_lang('MyInbox').'</a>&nbsp;';
echo '</div>';
echo '<div>';
echo Display::return_icon('edit.gif');
echo '&nbsp;<a href="../auth/profile.php?show=1">'.get_lang('EditInformation').'</a>&nbsp;';
echo '</div>';*/
} else {
echo '<br/>';
echo '<div class="actions" style="margin-right:5px;">';
echo '&nbsp;<a href="/main/messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">'.Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';
@ -493,17 +482,10 @@ echo '<div id="social-profile-container">';
}
}
echo '</div>';
}
echo '<br />';
// Send message or Add to friend links
/*if (!$show_full_profile) {
echo '&nbsp;&nbsp;<a href="../messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_id.'&view=profile" class="thickbox" title="'.get_lang('SendMessage').'">'.Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';
}*/
// Extra information
if ($show_full_profile) {
@ -704,32 +686,6 @@ echo '<div id="social-profile-container">';
$listInactives[] = $value;
}
}
/*
// --- Session registered
api_display_tool_title(get_lang('Sessions'));
if(count($listActives)>0) {
echo "<ul class=\"courseslist\">\n";
foreach ($listActives as $key => $value) {
if (!empty($value[2])) {
if ((isset($old_session) && $old_session != $value[2]) or ((!isset($old_session)) && isset($value[2]))) {
$old_session = $value[2];
if ($key != 0) {
echo '</ul>';
}
//echo '<ul class="session_box"><li class="session_box_title">'.$value[3]['title'].' '.$value[3]['dates'].'</li>';
echo '<ul>';
if ( !empty($value[3]['coach']) ) {
echo '<li class="session_box_coach">'.$value[3]['coach'].'</li>';
}
echo '</ul>';
echo '<ul class="session_course_item">';
}
}
echo $value[1];
}
echo '</ul>';
}
*/
}
echo '</ul><br />';
@ -747,5 +703,7 @@ echo '<div id="social-profile-container">';
echo '</div>';
echo '</div>';
echo '</div>'; //from the main
echo '<form id="id_reload" name="id_reload" action="profile.php">&nbsp;</form>';
Display :: display_footer();

11
main/social/show_search_image.inc.php
Unescape View File

@ -46,14 +46,9 @@ if (count($list_path_friends)!=0) {
$user_info=api_get_user_info($list_friends_id[$j]);
$user_name=api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName']));
$friends_profile = SocialManager::get_picture_user($list_friends_id[$j], $list_friends_file[$j], 92);
$friend_html.='<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].'>';
$friend_html.='<span><a href="profile.php?u='.$list_friends_id[$j].'"><center><img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" /></center></a></span>';
$friend_html.='<img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /> <center class="friend">'.$user_name.'</center></div>';
/*
* $friend_html.='&nbsp;<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].' style="float:left" >
* <img src="'.$list_friends_dir[$j]."/".$list_friends_file[$j].'" width="90" height="110" style="margin-left:3px ;margin-rigth:3px;margin-top:10px;margin-bottom:3px;" id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" onclick="qualify_friend(this)"/>
* <img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /></div>&nbsp;';
*/
$friend_html.='<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].' >
<span><center><img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" onclick=load_thick(\'qualify_contact.inc.php?path_user="'.urlencode($list_friends_dir[$j].$list_friends_file[$j]).'&amp;id_user="'.$list_friends_id[$j].'"\',"") /></center></span>
<img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /> <center class="friend">'.$user_name.'</center></div>';
}
$j++;
}

Write Preview
Loading…
Cancel
Save