@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | if (api_is_session_admin() && |
| 103 | 103 | api_get_setting('prevent_session_admins_to_manage_all_users') === 'true' |
| 104 | 104 | ) { |
| 105 | - $order_clause = " AND user.creator_id = " . api_get_user_id() . $order_clause; |
|
| 105 | + $order_clause = " AND user.creator_id = ".api_get_user_id().$order_clause; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | $cond_user_id = ''; |
| 109 | 109 | |
| 110 | 110 | // Only for single & multiple |
| 111 | - if (in_array($type, array('single','multiple'))) |
|
| 111 | + if (in_array($type, array('single', 'multiple'))) |
|
| 112 | 112 | if (!empty($id_session)) { |
| 113 | 113 | $id_session = intval($id_session); |
| 114 | 114 | // check id_user from session_rel_user table |
@@ -118,11 +118,11 @@ discard block |
||
| 118 | 118 | $user_ids = array(); |
| 119 | 119 | if (Database::num_rows($res) > 0) { |
| 120 | 120 | while ($row = Database::fetch_row($res)) { |
| 121 | - $user_ids[] = (int)$row[0]; |
|
| 121 | + $user_ids[] = (int) $row[0]; |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | if (count($user_ids) > 0) { |
| 125 | - $cond_user_id = ' AND user.id NOT IN('.implode(",",$user_ids).')'; |
|
| 125 | + $cond_user_id = ' AND user.id NOT IN('.implode(",", $user_ids).')'; |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | if (api_is_multiple_url_enabled()) { |
| 167 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 167 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 168 | 168 | $access_url_id = api_get_current_access_url_id(); |
| 169 | 169 | if ($access_url_id != -1) { |
| 170 | 170 | switch ($type) { |
@@ -215,10 +215,10 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | $rs = Database::query($sql); |
| 217 | 217 | $i = 0; |
| 218 | - if ($type=='single') { |
|
| 218 | + if ($type == 'single') { |
|
| 219 | 219 | while ($user = Database :: fetch_array($rs)) { |
| 220 | 220 | $i++; |
| 221 | - if ($i<=10) { |
|
| 221 | + if ($i <= 10) { |
|
| 222 | 222 | $person_name = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') '.$user['official_code']; |
| 223 | 223 | if ($showOfficialCode) { |
| 224 | 224 | $officialCode = !empty($user['official_code']) ? $user['official_code'].' - ' : '? - '; |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
| 234 | + $xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return)); |
|
| 235 | 235 | } else { |
| 236 | 236 | global $nosessionUsersList; |
| 237 | 237 | $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">'; |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $return .= '<option value="'.$user['id'].'">'.$person_name.' </option>'; |
| 245 | 245 | } |
| 246 | 246 | $return .= '</select>'; |
| 247 | - $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
| 247 | + $xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return)); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | return $xajax_response; |
@@ -355,10 +355,10 @@ discard block |
||
| 355 | 355 | $order_clause"; |
| 356 | 356 | |
| 357 | 357 | if (api_is_multiple_url_enabled()) { |
| 358 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 358 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 359 | 359 | $access_url_id = api_get_current_access_url_id(); |
| 360 | 360 | if ($access_url_id != -1) { |
| 361 | - $sql="SELECT u.id, lastname, firstname, username, session_id, official_code |
|
| 361 | + $sql = "SELECT u.id, lastname, firstname, username, session_id, official_code |
|
| 362 | 362 | FROM $tbl_user u |
| 363 | 363 | INNER JOIN $tbl_session_rel_user |
| 364 | 364 | ON $tbl_session_rel_user.user_id = u.id AND |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | $result = Database::query($sql); |
| 373 | 373 | $users = Database::store_result($result); |
| 374 | 374 | foreach ($users as $user) { |
| 375 | - $sessionUsersList[$user['id']] = $user ; |
|
| 375 | + $sessionUsersList[$user['id']] = $user; |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | $sessionUserInfo = SessionManager::getTotalUserCoursesInSession($id_session); |
@@ -408,12 +408,12 @@ discard block |
||
| 408 | 408 | if (isset($_POST[$varname]) && $_POST[$varname] != '0') { |
| 409 | 409 | $use_extra_fields = true; |
| 410 | 410 | if ($fieldtype == ExtraField::FIELD_TYPE_TAG) { |
| 411 | - $extra_field_result[]= UserManager::get_extra_user_data_by_tags( |
|
| 411 | + $extra_field_result[] = UserManager::get_extra_user_data_by_tags( |
|
| 412 | 412 | intval($_POST['field_id']), |
| 413 | 413 | $_POST[$varname] |
| 414 | 414 | ); |
| 415 | 415 | } else { |
| 416 | - $extra_field_result[]= UserManager::get_extra_user_data_by_value( |
|
| 416 | + $extra_field_result[] = UserManager::get_extra_user_data_by_value( |
|
| 417 | 417 | $new_field['variable'], |
| 418 | 418 | $_POST[$varname] |
| 419 | 419 | ); |
@@ -426,10 +426,10 @@ discard block |
||
| 426 | 426 | |
| 427 | 427 | if ($use_extra_fields) { |
| 428 | 428 | $final_result = array(); |
| 429 | - if (count($extra_field_result)>1) { |
|
| 430 | - for($i=0;$i<count($extra_field_result)-1;$i++) { |
|
| 431 | - if (is_array($extra_field_result[$i+1])) { |
|
| 432 | - $final_result = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]); |
|
| 429 | + if (count($extra_field_result) > 1) { |
|
| 430 | + for ($i = 0; $i < count($extra_field_result) - 1; $i++) { |
|
| 431 | + if (is_array($extra_field_result[$i + 1])) { |
|
| 432 | + $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]); |
|
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 | } else { |
@@ -437,14 +437,14 @@ discard block |
||
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | if (api_is_multiple_url_enabled()) { |
| 440 | - if (is_array($final_result) && count($final_result)>0) { |
|
| 441 | - $where_filter = " AND u.id IN ('".implode("','",$final_result)."') "; |
|
| 440 | + if (is_array($final_result) && count($final_result) > 0) { |
|
| 441 | + $where_filter = " AND u.id IN ('".implode("','", $final_result)."') "; |
|
| 442 | 442 | } else { |
| 443 | 443 | //no results |
| 444 | 444 | $where_filter = " AND u.id = -1"; |
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - if (is_array($final_result) && count($final_result)>0) { |
|
| 447 | + if (is_array($final_result) && count($final_result) > 0) { |
|
| 448 | 448 | $where_filter = " WHERE u.id IN ('".implode("','", $final_result)."') "; |
| 449 | 449 | } else { |
| 450 | 450 | //no results |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | } |
| 454 | 454 | } |
| 455 | 455 | if (api_is_session_admin() && api_get_setting('prevent_session_admins_to_manage_all_users') === 'true') { |
| 456 | - $order_clause = " AND u.creator_id = " . api_get_user_id() . $order_clause; |
|
| 456 | + $order_clause = " AND u.creator_id = ".api_get_user_id().$order_clause; |
|
| 457 | 457 | } |
| 458 | 458 | if ($use_extra_fields) { |
| 459 | 459 | $sql = "SELECT u.id, lastname, firstname, username, session_id, official_code |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | $order_clause"; |
| 476 | 476 | } |
| 477 | 477 | if (api_is_multiple_url_enabled()) { |
| 478 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 478 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 479 | 479 | $access_url_id = api_get_current_access_url_id(); |
| 480 | 480 | if ($access_url_id != -1) { |
| 481 | 481 | $sql = "SELECT u.id, lastname, firstname, username, session_id, official_code |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | } |
| 493 | 493 | |
| 494 | 494 | $result = Database::query($sql); |
| 495 | - $users = Database::store_result($result,'ASSOC'); |
|
| 495 | + $users = Database::store_result($result, 'ASSOC'); |
|
| 496 | 496 | |
| 497 | 497 | foreach ($users as $uid => $user) { |
| 498 | 498 | if ($user['session_id'] != $id_session) { |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | 'ln' => $user['lastname'], |
| 502 | 502 | 'un' => $user['username'], |
| 503 | 503 | 'official_code' => $user['official_code'] |
| 504 | - ) ; |
|
| 504 | + ); |
|
| 505 | 505 | unset($users[$uid]); |
| 506 | 506 | } |
| 507 | 507 | } |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | WHERE u.status<>".DRH." AND u.status<>6 $order_clause"; |
| 518 | 518 | |
| 519 | 519 | if (api_is_multiple_url_enabled()) { |
| 520 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 520 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 521 | 521 | $access_url_id = api_get_current_access_url_id(); |
| 522 | 522 | if ($access_url_id != -1) { |
| 523 | 523 | $sql = "SELECT u.id, lastname, firstname, username, session_id, official_code |
@@ -533,11 +533,11 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | $result = Database::query($sql); |
| 536 | - $users = Database::store_result($result,'ASSOC'); |
|
| 536 | + $users = Database::store_result($result, 'ASSOC'); |
|
| 537 | 537 | foreach ($users as $uid => $user) { |
| 538 | 538 | if ($user['session_id'] == $id_session) { |
| 539 | 539 | $sessionUsersList[$user['id']] = $user; |
| 540 | - if (array_key_exists($user['id'],$nosessionUsersList)) { |
|
| 540 | + if (array_key_exists($user['id'], $nosessionUsersList)) { |
|
| 541 | 541 | unset($nosessionUsersList[$user['id']]); |
| 542 | 542 | } |
| 543 | 543 | } |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>'; |
| 556 | 556 | } |
| 557 | 557 | $link_add_group = Display::url( |
| 558 | - Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'), |
|
| 558 | + Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'), |
|
| 559 | 559 | api_get_path(WEB_CODE_PATH).'admin/usergroups.php' |
| 560 | 560 | ); |
| 561 | 561 | |
@@ -576,12 +576,12 @@ discard block |
||
| 576 | 576 | echo $newLinks; |
| 577 | 577 | ?> |
| 578 | 578 | </div> |
| 579 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($addProcess)) echo '&add=true' ; ?>" <?php if ($ajax_search) { echo ' onsubmit="valide();"';}?>> |
|
| 579 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($addProcess)) echo '&add=true'; ?>" <?php if ($ajax_search) { echo ' onsubmit="valide();"'; }?>> |
|
| 580 | 580 | <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?> |
| 581 | 581 | <?php |
| 582 | -if ($add_type=='multiple') { |
|
| 582 | +if ($add_type == 'multiple') { |
|
| 583 | 583 | if (is_array($extra_field_list)) { |
| 584 | - if (is_array($new_field_list) && count($new_field_list)>0 ) { |
|
| 584 | + if (is_array($new_field_list) && count($new_field_list) > 0) { |
|
| 585 | 585 | echo '<h3>'.get_lang('FilterUsers').'</h3>'; |
| 586 | 586 | foreach ($new_field_list as $new_field) { |
| 587 | 587 | echo $new_field['name']; |
@@ -589,8 +589,8 @@ discard block |
||
| 589 | 589 | $fieldtype = $new_field['type']; |
| 590 | 590 | echo ' <select name="'.$varname.'">'; |
| 591 | 591 | echo '<option value="0">--'.get_lang('Select').'--</option>'; |
| 592 | - foreach ($new_field['data'] as $option) { |
|
| 593 | - $checked=''; |
|
| 592 | + foreach ($new_field['data'] as $option) { |
|
| 593 | + $checked = ''; |
|
| 594 | 594 | if ($fieldtype == ExtraField::FIELD_TYPE_TAG) { |
| 595 | 595 | if (isset($_POST[$varname])) { |
| 596 | 596 | if ($_POST[$varname] == $option['tag']) { |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | <div class="form-group"> |
| 632 | 632 | <label><?php echo get_lang('UserListInPlatform') ?> </label> |
| 633 | 633 | <?php |
| 634 | - if (!($add_type=='multiple')) { |
|
| 634 | + if (!($add_type == 'multiple')) { |
|
| 635 | 635 | ?> |
| 636 | 636 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" /> |
| 637 | 637 | <div id="ajax_list_users_single" class="select-list-ajax"></div> |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | <?php |
| 644 | 644 | foreach ($nosessionUsersList as $uid => $enreg) { |
| 645 | 645 | ?> |
| 646 | - <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>> |
|
| 646 | + <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>> |
|
| 647 | 647 | <?php |
| 648 | 648 | $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code']; |
| 649 | 649 | if ($showOfficialCode) { |
@@ -668,7 +668,7 @@ discard block |
||
| 668 | 668 | </div> |
| 669 | 669 | |
| 670 | 670 | <div class="col-md-4"> |
| 671 | - <?php if ($add_type=='multiple') { ?> |
|
| 671 | + <?php if ($add_type == 'multiple') { ?> |
|
| 672 | 672 | <?php echo get_lang('FirstLetterUser'); ?> : |
| 673 | 673 | |
| 674 | 674 | <select id="first_letter_user" name="firstLetterUser" onchange = "change_select(this.value);" > |