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

Minor - format code.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent c1d32bde0f
commit 50960831c0
4 changed files with 274 additions and 265 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. 1
      main/admin/add_users_to_session.php
  2. 10
      main/inc/ajax/social.ajax.php
  3. 80
      main/social/group_invitation.php
  4. 2
      main/social/profile.php

1
main/admin/add_users_to_session.php
Unescape View File

@ -49,6 +49,7 @@ $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
//checking for extra field with filter on
$extra_field_list = UserManager::get_extra_fields();
$new_field_list = array();
if (is_array($extra_field_list)) {
foreach ($extra_field_list as $extra_field) {

10
main/inc/ajax/social.ajax.php
Unescape View File

@ -17,11 +17,6 @@ switch ($action) {
}
$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']);
$friend_id_qualify = Security::remove_XSS($_POST['user_id_friend_q']);
$type_friend_qualify = Security::remove_XSS($_POST['type_friend_q']); //filtered?
$is_my_friend = Security::remove_XSS($_POST['is_my_friend']); //filtered?
if (isset($_POST['is_my_friend'])) {
$relation_type = USER_RELATION_TYPE_FRIEND; //My friend
@ -128,7 +123,9 @@ switch ($action) {
$user_id = intval($_SESSION['social_user_id']);
if ($_POST['action']) {$action = $_POST['action'];}
if ($_POST['action']) {
$action = $_POST['action'];
}
switch ($action) {
case 'load_course':
@ -189,7 +186,6 @@ switch ($action) {
}
break;
case 'unload_course':
//echo 'load2';
break;
default:
break;

80
main/social/group_invitation.php
Unescape View File

@ -20,9 +20,11 @@ require_once '../inc/lib/xajax/xajax.inc.php';
api_block_anonymous_users();
$xajax = new xajax();
//$xajax->debugOn();
$xajax->registerFunction ('search_users');
$add = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
@ -129,7 +131,6 @@ function search_users($needle,$type) {
}
}
}
$rs = Database::query($sql);
$i = 0;
if ($type=='single') {
@ -143,9 +144,7 @@ function search_users($needle,$type) {
}
}
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
} else {
global $nosessionUsersList;
$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
while ($user = Database :: fetch_array($rs)) {
$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) {
//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'];
$content = get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />';
$content .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />';
@ -234,8 +237,8 @@ if ($ajax_search) {
$sql= "SELECT u.user_id, lastname, firstname, username, group_id
FROM $tbl_user u
LEFT JOIN $tbl_group_rel_user gu
ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id ".
$order_clause;
ON (gu.user_id = u.user_id)
WHERE gu.group_id = $group_id $order_clause";
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -265,14 +268,18 @@ if ($ajax_search) {
} else {
foreach ($friends as $friend) {
$group_friend_list = GroupPortalManager::get_groups_by_user($friend['friend_user_id'], 0);
//var_dump($group_friend_list);
$friend_group_id = '';
if (isset($group_friend_list[$group_id]) && $group_friend_list[$group_id]['id'] == $group_id) {
$friend_group_id = $group_id;
}
//var_dump ($group_friend_list[$group_id]['relation_type']);
if ($group_friend_list[$group_id]['relation_type'] == '' ) {
$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 );
if (!isset($group_friend_list[$group_id]) || isset($group_friend_list[$group_id]) && empty($group_friend_list[$group_id]['relation_type'])) {
$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
);
}
}
}
@ -285,7 +292,7 @@ if ($ajax_search) {
}
}
//deleting anonymous users
// Deleting anonymous users
$user_anonymous = api_get_anonymous_id();
foreach ($nosessionUsersList as $key_user_list =>$value_user_list) {
if ($nosessionUsersList[$key_user_list]['user_id'] == $user_anonymous) {
@ -295,15 +302,15 @@ if ($ajax_search) {
}
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');
} else {
$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_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) {
$friends = SocialManager::get_friends(api_get_user_id());
@ -317,11 +324,17 @@ if (count($nosessionUsersList) == 0) {
$social_right_content .= '</div>';
}
if (!empty($_GET['add'])) $add_true = '&add=true';
if ($ajax_search) $ajax = 'onsubmit="valide();"';
$add_true = null;
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.'>';
/*$extra_field_list = UserManager::get_extra_fields();
if ($add_type == 'multiple') {
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
@ -347,7 +360,7 @@ if ($add_type=='multiple') {
$form .= '<br /><br />';
}
}
}
}*/
$form .= '<input type="hidden" name="form_sent" value="1" />';
$form .= '<input type="hidden" name="id" value="'.$group_id.'">';
@ -397,7 +410,6 @@ if (!($add_type=='multiple')) {
$form .= '</div>';
}
unset($nosessionUsersList);
$form .= '</div>';
$form .= '</td><td width="10%" valign="middle" align="center">';
@ -418,7 +430,6 @@ if ($ajax_search) {
foreach ($sessionUsersList as $enreg) {
$form .= ' <option value="'.$enreg['user_id'].'">'.api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')</option>';
}
unset($sessionUsersList);
$form .= '</select></td>
</tr>
<tr>
@ -432,7 +443,7 @@ $form .= '</select></td>
$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));
if (is_array($members) && count($members)>0) {
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" />';
}
$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[] = '
<script type="text/javascript">
<!--
$htmlHeadXtra[] = '<script>
function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
@ -489,9 +506,7 @@ function valide(){
document.forms.formulaire.submit();
}
function loadUsersInSelect(select) {
var xhr_object = null;
if(window.XMLHttpRequest) // Firefox
@ -513,7 +528,6 @@ function loadUsersInSelect(select){
xhr_object.onreadystatechange = function() {
if(xhr_object.readyState == 4) {
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+";;";
return ret;
}
-->
</script>';
$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->set_help('Groups');
$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('actions', $actions);
$tpl->assign('content', $content);
//$tpl->assign('actions', $actions);
//$tpl->assign('content', $content);
$social_layout = $tpl->get_template('layout/social_layout.tpl');
$tpl->display($social_layout);

2
main/social/profile.php
Unescape View File

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

Write Preview
Loading…
Cancel
Save