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 - Cleaning code indentation before fix - refs #4127

Browse Source
skala
Yannick Warnier 13 years ago
parent 8581d02bcd
commit 8ff7183439
1 changed files with 161 additions and 160 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. 321
      main/admin/add_users_to_session.php

321
main/admin/add_users_to_session.php
Unescape View File

@ -245,21 +245,21 @@ $sessions=array();
$noPHP_SELF=true; $noPHP_SELF=true;
if($_POST['form_sent']) { if($_POST['form_sent']) {
$form_sent = $_POST['form_sent']; $form_sent = $_POST['form_sent'];
$firstLetterUser = $_POST['firstLetterUser']; $firstLetterUser = $_POST['firstLetterUser'];
$firstLetterSession = $_POST['firstLetterSession']; $firstLetterSession = $_POST['firstLetterSession'];
$UserList = $_POST['sessionUsersList']; $UserList = $_POST['sessionUsersList'];
if (!is_array($UserList)) { if (!is_array($UserList)) {
$UserList=array(); $UserList=array();
} }
if ($form_sent == 1) { if ($form_sent == 1) {
//added a parameter to send emails when registering a user //added a parameter to send emails when registering a user
SessionManager::suscribe_users_to_session($id_session, $UserList, null, true); SessionManager::suscribe_users_to_session($id_session, $UserList, null, true);
header('Location: resume_session.php?id_session='.$id_session); header('Location: resume_session.php?id_session='.$id_session);
exit; exit;
} }
} }
$session_info = SessionManager::fetch($id_session); $session_info = SessionManager::fetch($id_session);
@ -272,163 +272,164 @@ global $_configuration;
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
if ($ajax_search) { if ($ajax_search) {
$sql="SELECT user_id, lastname, firstname, username, id_session $sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user FROM $tbl_user
INNER JOIN $tbl_session_rel_user INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = $tbl_user.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." ON $tbl_session_rel_user.id_user = $tbl_user.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session)." AND $tbl_session_rel_user.id_session = ".intval($id_session)."
WHERE status<>".DRH." $order_clause"; WHERE status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$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);
$access_url_id = api_get_current_access_url_id(); $access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){ if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session $sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
INNER JOIN $tbl_session_rel_user INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session)." AND $tbl_session_rel_user.id_session = ".intval($id_session)."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id) INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." WHERE access_url_id = $access_url_id AND u.status<>".DRH."
$order_clause"; $order_clause";
} }
} }
$result=Database::query($sql); $result=Database::query($sql);
$Users=Database::store_result($result); $users=Database::store_result($result);
foreach ($Users as $user) { foreach ($users as $user) {
$sessionUsersList[$user['user_id']] = $user ; $sessionUsersList[$user['user_id']] = $user ;
} }
} else { } else {
//Filter by Extra Fields //Filter by Extra Fields
$use_extra_fields = false; $use_extra_fields = false;
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 ) {
$result_list=array(); $result_list=array();
foreach ($new_field_list as $new_field) { foreach ($new_field_list as $new_field) {
$varname = 'field_'.$new_field['variable']; $varname = 'field_'.$new_field['variable'];
if (UserManager::is_extra_field_available($new_field['variable'])) { if (UserManager::is_extra_field_available($new_field['variable'])) {
if (isset($_POST[$varname]) && $_POST[$varname]!='0') { if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
$use_extra_fields = true; $use_extra_fields = true;
$extra_field_result[]= UserManager::get_extra_user_data_by_value($new_field['variable'], $_POST[$varname]); $extra_field_result[]= UserManager::get_extra_user_data_by_value($new_field['variable'], $_POST[$varname]);
} }
} }
} }
} }
} }
if ($use_extra_fields) {
$final_result = array();
if (count($extra_field_result)>1) {
for($i=0;$i<count($extra_field_result)-1;$i++) {
if (is_array($extra_field_result[$i+1])) {
$final_result = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
}
}
} else {
$final_result = $extra_field_result[0];
}
$where_filter ='';
if ($_configuration['multiple_access_urls']) {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " AND u.user_id = -1";
}
} else {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " WHERE u.user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " WHERE u.user_id = -1";
}
}
}
if ($use_extra_fields) {
$sql = "SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$where_filter AND u.status<>".DRH."
$order_clause";
} else { if ($use_extra_fields) {
$sql = "SELECT user_id, lastname, firstname, username, id_session $final_result = array();
FROM $tbl_user u if (count($extra_field_result)>1) {
LEFT JOIN $tbl_session_rel_user for($i=0;$i<count($extra_field_result)-1;$i++) {
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." if (is_array($extra_field_result[$i+1])) {
WHERE u.status<>".DRH." $final_result = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
$order_clause"; }
} }
if ($_configuration['multiple_access_urls']) { } else {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $final_result = $extra_field_result[0];
$access_url_id = api_get_current_access_url_id(); }
if ($access_url_id != -1){
$sql = "SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id $where_filter AND u.status<>".DRH."
$order_clause";
}
}
$result = Database::query($sql); $where_filter ='';
$Users = Database::store_result($result); if ($_configuration['multiple_access_urls']) {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " AND u.user_id = -1";
}
} else {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " WHERE u.user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " WHERE u.user_id = -1";
}
}
}
foreach ($Users as $user) { if ($use_extra_fields) {
if ($user['id_session'] != $id_session) $sql = "SELECT user_id, lastname, firstname, username, id_session
$nosessionUsersList[$user['user_id']] = $user ; FROM $tbl_user u
} LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$where_filter AND u.status<>".DRH."
$order_clause";
} else {
$sql = "SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH."
$order_clause";
}
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id $where_filter AND u.status<>".DRH."
$order_clause";
}
}
$user_anonymous=api_get_anonymous_id(); $result = Database::query($sql);
foreach($nosessionUsersList as $key_user_list =>$value_user_list) { $users = Database::store_result($result);
if ($nosessionUsersList[$key_user_list]['user_id']==$user_anonymous) {
unset($nosessionUsersList[$key_user_list]);
}
}
//filling the correct users in list foreach ($users as $user) {
$sql="SELECT user_id, lastname, firstname, username, id_session if ($user['id_session'] != $id_session) {
FROM $tbl_user u $nosessionUsersList[$user['user_id']] = $user ;
LEFT JOIN $tbl_session_rel_user }
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." }
WHERE u.status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']) { $user_anonymous=api_get_anonymous_id();
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); foreach ($nosessionUsersList as $key_user_list =>$value_user_list) {
$access_url_id = api_get_current_access_url_id(); if ($nosessionUsersList[$key_user_list]['user_id']==$user_anonymous) {
if ($access_url_id != -1){ unset($nosessionUsersList[$key_user_list]);
$sql="SELECT u.user_id, lastname, firstname, username, id_session }
FROM $tbl_user u }
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH."
$order_clause";
}
}
$result=Database::query($sql);
$Users=Database::store_result($result);
foreach($Users as $key_user_list =>$value_user_list) { //filling the correct users in list
if ($Users[$key_user_list]['user_id']==$user_anonymous) { $sql="SELECT user_id, lastname, firstname, username, id_session
unset($Users[$key_user_list]); FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH."
$order_clause";
} }
} }
$result=Database::query($sql);
$users=Database::store_result($result,'ASSOC');
foreach ($Users as $user) { foreach ($users as $key_user_list =>$value_user_list) {
if($user['id_session'] == $id_session){ if ($users[$key_user_list]['user_id']==$user_anonymous) {
$sessionUsersList[$user['user_id']] = $user; unset($users[$key_user_list]);
if (array_key_exists($user['user_id'],$nosessionUsersList)) { }
}
foreach ($users as $user) {
if ($user['id_session'] == $id_session){
$sessionUsersList[$user['user_id']] = $user;
if (array_key_exists($user['user_id'],$nosessionUsersList)) {
unset($nosessionUsersList[$user['user_id']]); unset($nosessionUsersList[$user['user_id']]);
} }
} }
} }
} }
if ($add_type == 'multiple') { if ($add_type == 'multiple') {
@ -521,7 +522,7 @@ if(!empty($errorMsg)) {
<div id="ajax_list_users_multiple"> <div id="ajax_list_users_multiple">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:380px;"> <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:380px;">
<?php <?php
foreach($nosessionUsersList as $enreg) { foreach ($nosessionUsersList as $enreg) {
?> ?>
<option value="<?php echo $enreg['user_id']; ?>" <?php if(in_array($enreg['user_id'],$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option> <option value="<?php echo $enreg['user_id']; ?>" <?php if(in_array($enreg['user_id'],$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
<?php <?php
@ -529,9 +530,9 @@ if(!empty($errorMsg)) {
?> ?>
</select> </select>
</div> </div>
<input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id"> <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
<label for="user_with_any_session_id"><?php echo get_lang('UsersRegisteredInNoSession'); ?></label> <label for="user_with_any_session_id"><?php echo get_lang('UsersRegisteredInNoSession'); ?></label>
<?php <?php
} }
unset($nosessionUsersList); unset($nosessionUsersList);
?> ?>

Write Preview
Loading…
Cancel
Save