Minor - format code.

1.9.x
Julio Montoya 12 years ago
parent c1d32bde0f
commit 50960831c0
  1. 5
      main/admin/add_users_to_session.php
  2. 366
      main/inc/ajax/social.ajax.php
  3. 166
      main/social/group_invitation.php
  4. 2
      main/social/profile.php

@ -48,7 +48,8 @@ $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
//checking for extra field with filter on //checking for extra field with filter on
$extra_field_list= UserManager::get_extra_fields(); $extra_field_list = UserManager::get_extra_fields();
$new_field_list = array(); $new_field_list = array();
if (is_array($extra_field_list)) { if (is_array($extra_field_list)) {
foreach ($extra_field_list as $extra_field) { foreach ($extra_field_list as $extra_field) {
@ -332,7 +333,7 @@ if ($ajax_search) {
} }
} else { } else {
if (is_array($final_result) && count($final_result)>0) { if (is_array($final_result) && count($final_result)>0) {
$where_filter = " WHERE u.user_id IN ('".implode("','",$final_result)."') "; $where_filter = " WHERE u.user_id IN ('".implode("','", $final_result)."') ";
} else { } else {
//no results //no results
$where_filter = " WHERE u.user_id = -1"; $where_filter = " WHERE u.user_id = -1";

@ -1,201 +1,197 @@
<?php <?php
/* For licensing terms, see /chamilo_license.txt */ /* For licensing terms, see /chamilo_license.txt */
/** /**
* Responses to AJAX calls * Responses to AJAX calls
*/ */
$language_file = array('messages','userInfo'); $language_file = array('messages','userInfo');
require_once '../global.inc.php'; require_once '../global.inc.php';
$action = isset($_GET['a']) ? $_GET['a'] : null; $action = isset($_GET['a']) ? $_GET['a'] : null;
$current_user_id = api_get_user_id(); $current_user_id = api_get_user_id();
switch ($action) { switch ($action) {
case 'add_friend': case 'add_friend':
if (api_is_anonymous()) { if (api_is_anonymous()) {
echo ''; echo '';
break; break;
} }
$my_current_friend = Security::remove_XSS($_POST['friend_id']); $my_current_friend = Security::remove_XSS($_POST['friend_id']);
$my_denied_current_friend= Security::remove_XSS($_POST['denied_friend_id']);
$my_delete_friend = Security::remove_XSS($_POST['delete_friend_id']); if (isset($_POST['is_my_friend'])) {
$friend_id_qualify = Security::remove_XSS($_POST['user_id_friend_q']); $relation_type = USER_RELATION_TYPE_FRIEND; //My friend
$type_friend_qualify = Security::remove_XSS($_POST['type_friend_q']); //filtered? } else {
$is_my_friend = Security::remove_XSS($_POST['is_my_friend']); //filtered? $relation_type = USER_RELATION_TYPE_UNKNOW; //Unknown contact
}
if (isset($_POST['is_my_friend'])) {
$relation_type = USER_RELATION_TYPE_FRIEND; //My friend if (isset($_POST['friend_id'])) {
} else { UserManager::relate_users($current_user_id, $my_current_friend, $relation_type);
$relation_type = USER_RELATION_TYPE_UNKNOW; //Unknown contact UserManager::relate_users($my_current_friend, $current_user_id, $relation_type);
} SocialManager::invitation_accepted($my_current_friend, $current_user_id);
Display::display_normal_message(api_xml_http_response_encode(get_lang('AddedContactToList')));
if (isset($_POST['friend_id'])) { }
UserManager::relate_users($current_user_id,$my_current_friend,$relation_type); break;
UserManager::relate_users($my_current_friend,$current_user_id,$relation_type); case 'deny_friend':
SocialManager::invitation_accepted($my_current_friend,$current_user_id); if (api_is_anonymous()) {
Display::display_normal_message(api_xml_http_response_encode(get_lang('AddedContactToList'))); echo '';
} break;
break; }
case 'deny_friend': $my_current_friend = Security::remove_XSS($_POST['friend_id']);
if (api_is_anonymous()){ $my_denied_current_friend= Security::remove_XSS($_POST['denied_friend_id']);
echo ''; $my_delete_friend = Security::remove_XSS($_POST['delete_friend_id']);
break; $friend_id_qualify = Security::remove_XSS($_POST['user_id_friend_q']);
} $type_friend_qualify = Security::remove_XSS($_POST['type_friend_q']); //filtered?
$my_current_friend = Security::remove_XSS($_POST['friend_id']); $is_my_friend = Security::remove_XSS($_POST['is_my_friend']); //filtered?
$my_denied_current_friend= Security::remove_XSS($_POST['denied_friend_id']); if (isset($_POST['is_my_friend'])) {
$my_delete_friend = Security::remove_XSS($_POST['delete_friend_id']); $relation_type=USER_RELATION_TYPE_FRIEND;//my friend
$friend_id_qualify = Security::remove_XSS($_POST['user_id_friend_q']); } else {
$type_friend_qualify = Security::remove_XSS($_POST['type_friend_q']); //filtered? $relation_type=USER_RELATION_TYPE_UNKNOW;//Contact unknown
$is_my_friend = Security::remove_XSS($_POST['is_my_friend']); //filtered? }
if (isset($_POST['is_my_friend'])) { if (isset($_POST['denied_friend_id'])) {
$relation_type=USER_RELATION_TYPE_FRIEND;//my friend SocialManager::invitation_denied($my_denied_current_friend, $current_user_id);
} else { Display::display_confirmation_message(api_xml_http_response_encode(get_lang('InvitationDenied')));
$relation_type=USER_RELATION_TYPE_UNKNOW;//Contact unknown }
} break;
if (isset($_POST['denied_friend_id'])) { case 'delete_friend':
SocialManager::invitation_denied($my_denied_current_friend,$current_user_id); if (api_is_anonymous()) {
Display::display_confirmation_message(api_xml_http_response_encode(get_lang('InvitationDenied'))); echo '';
} break;
break; }
case 'delete_friend': $my_delete_friend = intval($_POST['delete_friend_id']);
if (api_is_anonymous()) { if (isset($_POST['delete_friend_id'])) {
echo ''; SocialManager::remove_user_rel_user($my_delete_friend);
break; }
} break;
$my_delete_friend = intval($_POST['delete_friend_id']); case 'show_my_friends':
if (isset($_POST['delete_friend_id'])) { if (api_is_anonymous()) {
SocialManager::remove_user_rel_user($my_delete_friend); echo '';
} break;
break; }
case 'show_my_friends': $user_id = api_get_user_id();
if (api_is_anonymous()) { $name_search= Security::remove_XSS($_POST['search_name_q']);
echo ''; $number_friends = 0;
break;
} if (isset($name_search) && $name_search != 'undefined') {
$user_id = api_get_user_id(); $friends = SocialManager::get_friends($user_id, null, $name_search);
$name_search= Security::remove_XSS($_POST['search_name_q']); } else {
$number_friends = 0; $friends = SocialManager::get_friends($user_id);
}
if (isset($name_search) && $name_search != 'undefined') {
$friends = SocialManager::get_friends($user_id, null, $name_search); $friend_html = '';
} else { $number_of_images = 8;
$friends = SocialManager::get_friends($user_id);
} $number_friends = count($friends);
if ($number_friends != 0) {
$friend_html = ''; $number_loop = ($number_friends/$number_of_images);
$number_of_images = 8; $loop_friends = ceil($number_loop);
$j=0;
$number_friends = count($friends); $friend_html.= '<ul class="thumbnails">';
if ($number_friends != 0) { for ($k=0; $k<$loop_friends; $k++) {
$number_loop = ($number_friends/$number_of_images); if ($j==$number_of_images) {
$loop_friends = ceil($number_loop); $number_of_images=$number_of_images*2;
$j=0; }
$friend_html.= '<ul class="thumbnails">'; while ($j<$number_of_images) {
for ($k=0;$k<$loop_friends;$k++) { if (isset($friends[$j])) {
if ($j==$number_of_images) {
$number_of_images=$number_of_images*2;
}
while ($j<$number_of_images) {
if (isset($friends[$j])) {
$friend_html.='<li class="span2">'; $friend_html.='<li class="span2">';
$friend = $friends[$j]; $friend = $friends[$j];
$user_name = api_xml_http_response_encode($friend['firstName'].' '.$friend['lastName']); $user_name = api_xml_http_response_encode($friend['firstName'].' '.$friend['lastName']);
$friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 92); $friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 92);
$friend_html.='<div class="thumbnail" onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$friends[$j]['friend_user_id'].'>'; $friend_html.='<div class="thumbnail" onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$friends[$j]['friend_user_id'].'>';
$friend_html.='<img src="'.$friends_profile['file'].'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'" />'; $friend_html.='<img src="'.$friends_profile['file'].'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'" />';
$friend_html.='<div class="caption">'; $friend_html.='<div class="caption">';
$friend_html.='<a href="profile.php?u='.$friend['friend_user_id'].'"><h5>'.$user_name.'</h5></a>'; $friend_html.='<a href="profile.php?u='.$friend['friend_user_id'].'"><h5>'.$user_name.'</h5></a>';
$friend_html.='<p><button class="btn" onclick="delete_friend(this)" id=img_'.$friend['friend_user_id'].'>'.get_lang('Delete').'</button></p>'; $friend_html.='<p><button class="btn" onclick="delete_friend(this)" id=img_'.$friend['friend_user_id'].'>'.get_lang('Delete').'</button></p>';
$friend_html.='</div>'; $friend_html.='</div>';
$friend_html.='</div>'; $friend_html.='</div>';
$friend_html.='</li>'; $friend_html.='</li>';
} }
$j++; $j++;
} }
} }
$friend_html.='</ul>'; $friend_html.='</ul>';
} }
echo $friend_html; echo $friend_html;
break; break;
case 'toogle_course': case 'toogle_course':
if (api_is_anonymous()){ if (api_is_anonymous()) {
echo ''; echo '';
break; break;
} }
require_once api_get_path(LIBRARY_PATH).'blog.lib.php'; require_once api_get_path(LIBRARY_PATH).'blog.lib.php';
require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php'; require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
$user_id = intval($_SESSION['social_user_id']); $user_id = intval($_SESSION['social_user_id']);
if ($_POST['action']) {$action = $_POST['action'];} if ($_POST['action']) {
$action = $_POST['action'];
switch ($action) { }
case 'load_course' :
$course_id = intval($_POST['course_code']); // the int course id switch ($action) {
$course_info = api_get_course_info_by_id($course_id); case 'load_course':
$course_code = $course_info['code']; $course_id = intval($_POST['course_code']); // the int course id
$course_info = api_get_course_info_by_id($course_id);
if (api_is_user_of_course($course_code, api_get_user_id())) { $course_code = $course_info['code'];
//------Forum messages
$forum_result = get_all_post_from_user($user_id, $course_code); if (api_is_user_of_course($course_code, api_get_user_id())) {
$all_result_data = 0; //------Forum messages
if ($forum_result !='') { $forum_result = get_all_post_from_user($user_id, $course_code);
echo '<div id="social-forum-main-title">'; $all_result_data = 0;
echo api_xml_http_response_encode(get_lang('Forum')); if ($forum_result !='') {
echo '</div>'; echo '<div id="social-forum-main-title">';
echo api_xml_http_response_encode(get_lang('Forum'));
echo '<div style="background:#FAF9F6; padding:0px;" >'; echo '</div>';
echo api_xml_http_response_encode($forum_result);
echo '</div>'; echo '<div style="background:#FAF9F6; padding:0px;" >';
echo '<br />'; echo api_xml_http_response_encode($forum_result);
$all_result_data++; echo '</div>';
} echo '<br />';
$all_result_data++;
//------Blog posts }
$result = get_blog_post_from_user($course_code, $user_id);
//------Blog posts
if (!empty($result)) { $result = get_blog_post_from_user($course_code, $user_id);
api_display_tool_title(api_xml_http_response_encode(get_lang('Blog')));
echo '<div style="background:#FAF9F6; padding:0px;">'; if (!empty($result)) {
echo api_xml_http_response_encode($result); api_display_tool_title(api_xml_http_response_encode(get_lang('Blog')));
echo '</div>'; echo '<div style="background:#FAF9F6; padding:0px;">';
echo '<br />'; echo api_xml_http_response_encode($result);
$all_result_data++; echo '</div>';
} echo '<br />';
$all_result_data++;
//------Blog comments }
$result = get_blog_comment_from_user($course_code, $user_id);
if (!empty($result)) { //------Blog comments
echo '<div style="background:#FAF9F6; padding-left:10px;">'; $result = get_blog_comment_from_user($course_code, $user_id);
api_display_tool_title(api_xml_http_response_encode(get_lang('BlogComments'))); if (!empty($result)) {
echo api_xml_http_response_encode($result); echo '<div style="background:#FAF9F6; padding-left:10px;">';
echo '</div>'; api_display_tool_title(api_xml_http_response_encode(get_lang('BlogComments')));
echo '<br />'; echo api_xml_http_response_encode($result);
$all_result_data++; echo '</div>';
} echo '<br />';
if ($all_result_data == 0) { $all_result_data++;
echo api_xml_http_response_encode(get_lang('NoDataAvailable')); }
} if ($all_result_data == 0) {
echo api_xml_http_response_encode(get_lang('NoDataAvailable'));
} else { }
echo '<div class="clear"></div><br />';
api_display_tool_title(api_xml_http_response_encode(get_lang('Details'))); } else {
echo '<div style="background:#FAF9F6; padding:0px;">'; echo '<div class="clear"></div><br />';
echo api_xml_http_response_encode(get_lang('UserNonRegisteredAtTheCourse')); api_display_tool_title(api_xml_http_response_encode(get_lang('Details')));
echo '<div class="clear"></div><br />'; echo '<div style="background:#FAF9F6; padding:0px;">';
echo '</div>'; echo api_xml_http_response_encode(get_lang('UserNonRegisteredAtTheCourse'));
echo '<div class="clear"></div><br />'; echo '<div class="clear"></div><br />';
} echo '</div>';
break; echo '<div class="clear"></div><br />';
case 'unload_course' : }
//echo 'load2'; break;
break; case 'unload_course':
default: break;
break; default:
} break;
break; }
default: break;
echo ''; default:
echo '';
} }
exit; exit;

@ -8,10 +8,10 @@
* Initialization * Initialization
*/ */
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file=array('userInfo'); $language_file = array('userInfo');
// resetting the course id // resetting the course id
$cidReset=true; $cidReset = true;
// including some necessary dokeos files // including some necessary dokeos files
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
@ -20,8 +20,10 @@ require_once '../inc/lib/xajax/xajax.inc.php';
api_block_anonymous_users(); api_block_anonymous_users();
$xajax = new xajax(); $xajax = new xajax();
//$xajax->debugOn();
$xajax -> registerFunction ('search_users'); $xajax->registerFunction ('search_users');
$add = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
// setting the section (for the tabs) // setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN; $this_section = SECTION_PLATFORM_ADMIN;
@ -63,7 +65,7 @@ if (empty($group_id)) {
} }
} }
function search_users($needle,$type) { function search_users($needle, $type) {
global $tbl_user,$tbl_group_rel_user,$group_id; global $tbl_user,$tbl_group_rel_user,$group_id;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
$return = ''; $return = '';
@ -89,7 +91,7 @@ function search_users($needle,$type) {
$user_ids[] = (int)$row[0]; $user_ids[] = (int)$row[0];
} }
} }
if (count($user_ids) > 0){ if (count($user_ids) > 0) {
$cond_user_id = ' AND user_id NOT IN('.implode(",",$user_ids).')'; $cond_user_id = ' AND user_id NOT IN('.implode(",",$user_ids).')';
} }
} }
@ -129,7 +131,6 @@ function search_users($needle,$type) {
} }
} }
} }
$rs = Database::query($sql); $rs = Database::query($sql);
$i = 0; $i = 0;
if ($type=='single') { if ($type=='single') {
@ -143,9 +144,7 @@ function search_users($needle,$type) {
} }
} }
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
} else { } else {
global $nosessionUsersList;
$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">'; $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
while ($user = Database :: fetch_array($rs)) { while ($user = Database :: fetch_array($rs)) {
$person_name = api_get_person_name($user['firstname'], $user['lastname']); $person_name = api_get_person_name($user['firstname'], $user['lastname']);
@ -211,7 +210,11 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
} }
if ($form_sent == 1) { if ($form_sent == 1) {
//invite this users //invite this users
$result = GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION); $result = GroupPortalManager::add_users_to_groups(
$user_list,
array($group_id),
GROUP_USER_PERMISSION_PENDING_INVITATION
);
$title = get_lang('YouAreInvitedToGroup').' '.$group_info['name']; $title = get_lang('YouAreInvitedToGroup').' '.$group_info['name'];
$content = get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />'; $content = get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />';
$content .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />'; $content .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />';
@ -219,7 +222,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
if (is_array($user_list) && count($user_list) > 0) { if (is_array($user_list) && count($user_list) > 0) {
//send invitation message //send invitation message
foreach ($user_list as $user_id ) { foreach ($user_list as $user_id) {
$result = MessageManager::send_message($user_id, $title, $content); $result = MessageManager::send_message($user_id, $title, $content);
} }
} }
@ -234,8 +237,8 @@ if ($ajax_search) {
$sql= "SELECT u.user_id, lastname, firstname, username, group_id $sql= "SELECT u.user_id, lastname, firstname, username, group_id
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_group_rel_user gu LEFT JOIN $tbl_group_rel_user gu
ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id ". ON (gu.user_id = u.user_id)
$order_clause; WHERE gu.group_id = $group_id $order_clause";
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -257,72 +260,82 @@ if ($ajax_search) {
$sessionUsersList[$user['user_id']] = $user ; $sessionUsersList[$user['user_id']] = $user ;
} }
} else { } else {
$friends = SocialManager::get_friends(api_get_user_id()); $friends = SocialManager::get_friends(api_get_user_id());
$suggest_friends = false; $suggest_friends = false;
if (!$friends) { if (!$friends) {
$suggest_friends = true; $suggest_friends = true;
} else { } else {
foreach($friends as $friend) { foreach ($friends as $friend) {
$group_friend_list = GroupPortalManager::get_groups_by_user($friend['friend_user_id'], 0); $group_friend_list = GroupPortalManager::get_groups_by_user($friend['friend_user_id'], 0);
//var_dump($group_friend_list); $friend_group_id = '';
$friend_group_id = ''; if (isset($group_friend_list[$group_id]) && $group_friend_list[$group_id]['id'] == $group_id) {
if (isset($group_friend_list[$group_id]) && $group_friend_list[$group_id]['id'] == $group_id) { $friend_group_id = $group_id;
$friend_group_id = $group_id; }
} if (!isset($group_friend_list[$group_id]) || isset($group_friend_list[$group_id]) && empty($group_friend_list[$group_id]['relation_type'])) {
//var_dump ($group_friend_list[$group_id]['relation_type']); $Users[$friend['friend_user_id']] = array(
if ($group_friend_list[$group_id]['relation_type'] == '' ) { 'user_id' => $friend['friend_user_id'],
$Users[$friend['friend_user_id']]=array('user_id' => $friend['friend_user_id'], 'firstname' =>$friend['firstName'], 'lastname' => $friend['lastName'], 'username' =>$friend['username'],'group_id'=>$friend_group_id ); 'firstname' => $friend['firstName'],
} 'lastname' => $friend['lastName'],
'username' =>$friend['username'],
'group_id'=> $friend_group_id
);
} }
} }
}
if (is_array($Users) && count($Users) > 0) { if (is_array($Users) && count($Users) > 0) {
foreach ($Users as $user) { foreach ($Users as $user) {
if ($user['group_id'] != $group_id) { if ($user['group_id'] != $group_id) {
$nosessionUsersList[$user['user_id']] = $user; $nosessionUsersList[$user['user_id']] = $user;
}
} }
} }
}
//deleting anonymous users // Deleting anonymous users
$user_anonymous = api_get_anonymous_id(); $user_anonymous = api_get_anonymous_id();
foreach ($nosessionUsersList as $key_user_list =>$value_user_list) { foreach ($nosessionUsersList as $key_user_list =>$value_user_list) {
if ($nosessionUsersList[$key_user_list]['user_id'] == $user_anonymous) { if ($nosessionUsersList[$key_user_list]['user_id'] == $user_anonymous) {
unset($nosessionUsersList[$key_user_list]); unset($nosessionUsersList[$key_user_list]);
}
} }
}
} }
if ($add_type == 'multiple') { if ($add_type == 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>'; $link_add_type_unique = '<a href="'.api_get_self().'?id='.$group_id.'&add='.$add.'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'); $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
} else { } else {
$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'); $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
$link_add_type_multiple = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>'; $link_add_type_multiple = '<a href="'.api_get_self().'?id='.$group_id.'&add='.$add.'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
} }
$social_left_content = SocialManager::show_social_menu('invite_friends',$group_id); $social_left_content = SocialManager::show_social_menu('invite_friends',$group_id);
$social_right_content .= '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>'; $social_right_content = '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>';
if (count($nosessionUsersList) == 0) { if (count($nosessionUsersList) == 0) {
$friends = SocialManager::get_friends(api_get_user_id()); $friends = SocialManager::get_friends(api_get_user_id());
if ($friends == 0) { if ($friends == 0) {
$social_right_content .= get_lang('YouNeedToHaveFriendsInYourSocialNetwork'); $social_right_content .= get_lang('YouNeedToHaveFriendsInYourSocialNetwork');
} else { } else {
$social_right_content .= get_lang('YouAlreadyInviteAllYourContacts'); $social_right_content .= get_lang('YouAlreadyInviteAllYourContacts');
} }
$social_right_content .= '<div>'; $social_right_content .= '<div>';
$social_right_content .= '<a href="search.php">'.get_lang('TryAndFindSomeFriends').'</a>'; $social_right_content .= '<a href="search.php">'.get_lang('TryAndFindSomeFriends').'</a>';
$social_right_content .= '</div>'; $social_right_content .= '</div>';
} }
if (!empty($_GET['add'])) $add_true = '&add=true'; $add_true = null;
if ($ajax_search) $ajax = 'onsubmit="valide();"'; if (!empty($_GET['add'])) {
$add_true = '&add=true';
}
$ajax = null;
if ($ajax_search) {
$ajax = 'onsubmit="valide();"';
}
$form = '<form name="formulaire" method="post" action="'.api_get_self().'?id='.$group_id.$add_true.'" style="margin:0px;" '.$ajax.'>'; $form = '<form name="formulaire" method="post" action="'.api_get_self().'?id='.$group_id.$add_true.'" style="margin:0px;" '.$ajax.'>';
/*$extra_field_list = UserManager::get_extra_fields();
if ($add_type=='multiple') { if ($add_type == 'multiple') {
if (is_array($extra_field_list)) { if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) { if (is_array($new_field_list) && count($new_field_list)>0 ) {
$form .= '<h3>'.get_lang('FilterUsers').'</h3>'; $form .= '<h3>'.get_lang('FilterUsers').'</h3>';
@ -347,7 +360,7 @@ if ($add_type=='multiple') {
$form .= '<br /><br />'; $form .= '<br /><br />';
} }
} }
} }*/
$form .= '<input type="hidden" name="form_sent" value="1" />'; $form .= '<input type="hidden" name="form_sent" value="1" />';
$form .= '<input type="hidden" name="id" value="'.$group_id.'">'; $form .= '<input type="hidden" name="id" value="'.$group_id.'">';
@ -388,7 +401,7 @@ if (!($add_type=='multiple')) {
$form .= '<div id="ajax_list_users_multiple"> $form .= '<div id="ajax_list_users_multiple">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:290px;">'; <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:290px;">';
foreach($nosessionUsersList as $enreg) { foreach ($nosessionUsersList as $enreg) {
$selected = ''; $selected = '';
if(in_array($enreg['user_id'],$UserList)) $selected = 'selected="selected"'; if(in_array($enreg['user_id'],$UserList)) $selected = 'selected="selected"';
$form .= '<option value="'.$enreg['user_id'].'" '.$selected.'>'.api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].') </option>'; $form .= '<option value="'.$enreg['user_id'].'" '.$selected.'>'.api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].') </option>';
@ -397,7 +410,6 @@ if (!($add_type=='multiple')) {
$form .= '</div>'; $form .= '</div>';
} }
unset($nosessionUsersList);
$form .= '</div>'; $form .= '</div>';
$form .= '</td><td width="10%" valign="middle" align="center">'; $form .= '</td><td width="10%" valign="middle" align="center">';
@ -415,10 +427,9 @@ if ($ajax_search) {
<td align="center"> <td align="center">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:290px;">'; <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:290px;">';
foreach($sessionUsersList as $enreg) { foreach ($sessionUsersList as $enreg) {
$form .= ' <option value="'.$enreg['user_id'].'">'.api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')</option>'; $form .= ' <option value="'.$enreg['user_id'].'">'.api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')</option>';
} }
unset($sessionUsersList);
$form .= '</select></td> $form .= '</select></td>
</tr> </tr>
<tr> <tr>
@ -432,7 +443,7 @@ $form .= '</select></td>
$social_right_content .= $form; $social_right_content .= $form;
//current group members // Current group members
$members = GroupPortalManager::get_users_by_group($group_id, false, array(GROUP_USER_PERMISSION_PENDING_INVITATION)); $members = GroupPortalManager::get_users_by_group($group_id, false, array(GROUP_USER_PERMISSION_PENDING_INVITATION));
if (is_array($members) && count($members)>0) { if (is_array($members) && count($members)>0) {
foreach ($members as &$member) { foreach ($members as &$member) {
@ -441,12 +452,18 @@ if (is_array($members) && count($members)>0) {
$member['image'] = '<img src="'.$picture['file'].'" width="50px" height="50px" />'; $member['image'] = '<img src="'.$picture['file'].'" width="50px" height="50px" />';
} }
$social_right_content .= '<h3>'.get_lang('UsersAlreadyInvited').'</h3>'; $social_right_content .= '<h3>'.get_lang('UsersAlreadyInvited').'</h3>';
$social_right_content .= Display::return_sortable_grid('invitation_profile', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true)); $social_right_content .= Display::return_sortable_grid(
'invitation_profile',
array(),
$members,
array('hide_navigation'=>true, 'per_page' => 100),
$query_vars,
false,
array(true, false, true, true)
);
} }
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '<script>
<script type="text/javascript">
<!--
function moveItem(origin , destination) { function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) { for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) { if(origin.options[i].selected) {
@ -489,9 +506,7 @@ function valide(){
document.forms.formulaire.submit(); document.forms.formulaire.submit();
} }
function loadUsersInSelect(select) {
function loadUsersInSelect(select){
var xhr_object = null; var xhr_object = null;
if(window.XMLHttpRequest) // Firefox if(window.XMLHttpRequest) // Firefox
@ -513,7 +528,6 @@ function loadUsersInSelect(select){
xhr_object.onreadystatechange = function() { xhr_object.onreadystatechange = function() {
if(xhr_object.readyState == 4) { if(xhr_object.readyState == 4) {
document.getElementById("content_source").innerHTML = result = xhr_object.responseText; document.getElementById("content_source").innerHTML = result = xhr_object.responseText;
//alert(xhr_object.responseText);
} }
} }
} }
@ -525,7 +539,6 @@ function makepost(select) {
ret = ret + options[i].value +\'::\'+options[i].text+";;"; ret = ret + options[i].value +\'::\'+options[i].text+";;";
return ret; return ret;
} }
-->
</script>'; </script>';
$social_right_content = Display::div($social_right_content, array('class' => 'span9')); $social_right_content = Display::div($social_right_content, array('class' => 'span9'));
@ -533,10 +546,9 @@ $social_right_content = Display::div($social_right_content, array('class' => 'sp
$tpl = new Template($tool_name); $tpl = new Template($tool_name);
$tpl->set_help('Groups'); $tpl->set_help('Groups');
$tpl->assign('social_left_content', $social_left_content); $tpl->assign('social_left_content', $social_left_content);
$tpl->assign('social_left_menu', $social_left_menu); //$tpl->assign('social_left_menu', $social_left_menu);
$tpl->assign('social_right_content', $social_right_content); $tpl->assign('social_right_content', $social_right_content);
//$tpl->assign('actions', $actions);
$tpl->assign('actions', $actions); //$tpl->assign('content', $content);
$tpl->assign('content', $content);
$social_layout = $tpl->get_template('layout/social_layout.tpl'); $social_layout = $tpl->get_template('layout/social_layout.tpl');
$tpl->display($social_layout); $tpl->display($social_layout);

@ -594,7 +594,7 @@ if ($show_full_profile) {
//Pending invitations //Pending invitations
if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) { if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) {
if ($count_pending_invitations > 0) { if ($count_pending_invitations > 0) {
$invitations .= '<div><h3>'.get_lang('PendingInvitations').'</h3></div>'; $invitations = '<div><h3>'.get_lang('PendingInvitations').'</h3></div>';
for ($i=0;$i<$count_pending_invitations;$i++) { for ($i=0;$i<$count_pending_invitations;$i++) {
$user_invitation_id = $pending_invitations[$i]['user_sender_id']; $user_invitation_id = $pending_invitations[$i]['user_sender_id'];
$invitations .= '<div id="dpending_'.$user_invitation_id.'" class="friend_invitations">'; $invitations .= '<div id="dpending_'.$user_invitation_id.'" class="friend_invitations">';

Loading…
Cancel
Save