@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | const USER_FIELD_TYPE_TIMEZONE = 11; |
| 35 | 35 | const USER_FIELD_TYPE_SOCIAL_PROFILE = 12; |
| 36 | 36 | const USER_FIELD_TYPE_FILE = 13; |
| 37 | - const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER = 14; |
|
| 37 | + const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER = 14; |
|
| 38 | 38 | |
| 39 | 39 | private static $encryptionMethod; |
| 40 | 40 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | if (empty($password)) { |
| 283 | - Display::addFlash(Display::return_message(get_lang('ThisFieldIsRequired').': '.get_lang('Password') , 'warning')); |
|
| 283 | + Display::addFlash(Display::return_message(get_lang('ThisFieldIsRequired').': '.get_lang('Password'), 'warning')); |
|
| 284 | 284 | |
| 285 | 285 | return false; |
| 286 | 286 | } |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | $res = Database::query($sql); |
| 495 | 495 | while ($course = Database::fetch_object($res)) { |
| 496 | 496 | $sql = "SELECT id FROM $table_course_user |
| 497 | - WHERE status=1 AND c_id = " . intval($course->c_id); |
|
| 497 | + WHERE status=1 AND c_id = ".intval($course->c_id); |
|
| 498 | 498 | $res2 = Database::query($sql); |
| 499 | 499 | if (Database::num_rows($res2) == 1) { |
| 500 | 500 | |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | $sql = "UPDATE $table_user SET active = 1 WHERE id IN ($ids)"; |
| 759 | 759 | $r = Database::query($sql); |
| 760 | 760 | if ($r !== false) { |
| 761 | - Event::addEvent(LOG_USER_ENABLE,LOG_USER_ID,$ids); |
|
| 761 | + Event::addEvent(LOG_USER_ENABLE, LOG_USER_ID, $ids); |
|
| 762 | 762 | } |
| 763 | 763 | return $r; |
| 764 | 764 | } |
@@ -1164,7 +1164,7 @@ discard block |
||
| 1164 | 1164 | // 1. Conversion of unacceptable letters (latinian letters with accents for example) into ASCII letters in order they not to be totally removed. |
| 1165 | 1165 | // 2. Applying the strict purifier. |
| 1166 | 1166 | // 3. Length limitation. |
| 1167 | - $return = api_get_setting('login_is_email') == 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH); |
|
| 1167 | + $return = api_get_setting('login_is_email') == 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH); |
|
| 1168 | 1168 | $return = URLify::transliterate($return); |
| 1169 | 1169 | return $return; |
| 1170 | 1170 | } |
@@ -1256,12 +1256,12 @@ discard block |
||
| 1256 | 1256 | |
| 1257 | 1257 | if (!is_null($order)) { |
| 1258 | 1258 | $order = Database::escape_string($order); |
| 1259 | - $sql .= ' ORDER BY ' . $order; |
|
| 1259 | + $sql .= ' ORDER BY '.$order; |
|
| 1260 | 1260 | } |
| 1261 | 1261 | |
| 1262 | 1262 | if (!is_null($limit)) { |
| 1263 | 1263 | $limit = Database::escape_string($limit); |
| 1264 | - $sql .= ' LIMIT ' . $limit; |
|
| 1264 | + $sql .= ' LIMIT '.$limit; |
|
| 1265 | 1265 | } |
| 1266 | 1266 | |
| 1267 | 1267 | $rs = Database::query($sql); |
@@ -1443,7 +1443,7 @@ discard block |
||
| 1443 | 1443 | // In exceptional cases, on some portals, the intermediate base user |
| 1444 | 1444 | // directory might not have been created. Make sure it is before |
| 1445 | 1445 | // going further. |
| 1446 | - $rootPath = api_get_path(SYS_UPLOAD_PATH) . 'users/' . substr((string) $id, 0, 1); |
|
| 1446 | + $rootPath = api_get_path(SYS_UPLOAD_PATH).'users/'.substr((string) $id, 0, 1); |
|
| 1447 | 1447 | if (!is_dir($rootPath)) { |
| 1448 | 1448 | $perm = api_get_permissions_for_new_directories(); |
| 1449 | 1449 | try { |
@@ -1695,7 +1695,7 @@ discard block |
||
| 1695 | 1695 | $path_info = self::get_user_picture_path_by_id($user_id, 'system'); |
| 1696 | 1696 | $path = $path_info['dir']; |
| 1697 | 1697 | if (!empty($extra_field)) { |
| 1698 | - $path .= $extra_field . '/'; |
|
| 1698 | + $path .= $extra_field.'/'; |
|
| 1699 | 1699 | } |
| 1700 | 1700 | // If this directory does not exist - we create it. |
| 1701 | 1701 | if (!file_exists($path)) { |
@@ -1703,7 +1703,7 @@ discard block |
||
| 1703 | 1703 | } |
| 1704 | 1704 | |
| 1705 | 1705 | if (filter_extension($file)) { |
| 1706 | - if (@move_uploaded_file($source_file,$path.$file)) { |
|
| 1706 | + if (@move_uploaded_file($source_file, $path.$file)) { |
|
| 1707 | 1707 | if ($extra_field) { |
| 1708 | 1708 | return $extra_field.'/'.$file; |
| 1709 | 1709 | } else { |
@@ -1956,10 +1956,10 @@ discard block |
||
| 1956 | 1956 | if (count($extra_files) > 0) { |
| 1957 | 1957 | $extra_file_list = '<div class="files-production"><ul id="productions">'; |
| 1958 | 1958 | foreach ($extra_files as $file) { |
| 1959 | - $filename = substr($file,strlen($extra_field)+1); |
|
| 1959 | + $filename = substr($file, strlen($extra_field) + 1); |
|
| 1960 | 1960 | $extra_file_list .= '<li>'.Display::return_icon('archive.png').'<a href="'.$path.$extra_field.'/'.urlencode($filename).'" target="_blank">'.htmlentities($filename).'</a> '; |
| 1961 | 1961 | if ($showdelete) { |
| 1962 | - $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_' . $extra_field . '['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>'; |
|
| 1962 | + $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_'.$extra_field.'['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>'; |
|
| 1963 | 1963 | } |
| 1964 | 1964 | } |
| 1965 | 1965 | $extra_file_list .= '</ul></div>'; |
@@ -2546,7 +2546,7 @@ discard block |
||
| 2546 | 2546 | |
| 2547 | 2547 | if (api_is_allowed_to_create_course()) { |
| 2548 | 2548 | $sessionListFromCourseCoach = array(); |
| 2549 | - $sql =" SELECT DISTINCT session_id |
|
| 2549 | + $sql = " SELECT DISTINCT session_id |
|
| 2550 | 2550 | FROM $tbl_session_course_user |
| 2551 | 2551 | WHERE user_id = $user_id AND status = 2 "; |
| 2552 | 2552 | |
@@ -2554,7 +2554,7 @@ discard block |
||
| 2554 | 2554 | if (Database::num_rows($result)) { |
| 2555 | 2555 | $result = Database::store_result($result); |
| 2556 | 2556 | foreach ($result as $session) { |
| 2557 | - $sessionListFromCourseCoach[]= $session['session_id']; |
|
| 2557 | + $sessionListFromCourseCoach[] = $session['session_id']; |
|
| 2558 | 2558 | } |
| 2559 | 2559 | } |
| 2560 | 2560 | if (!empty($sessionListFromCourseCoach)) { |
@@ -2577,7 +2577,7 @@ discard block |
||
| 2577 | 2577 | ORDER BY access_start_date, access_end_date, name"; |
| 2578 | 2578 | |
| 2579 | 2579 | $result = Database::query($sql); |
| 2580 | - if (Database::num_rows($result)>0) { |
|
| 2580 | + if (Database::num_rows($result) > 0) { |
|
| 2581 | 2581 | while ($row = Database::fetch_assoc($result)) { |
| 2582 | 2582 | $sessions[$row['id']] = $row; |
| 2583 | 2583 | } |
@@ -2593,7 +2593,7 @@ discard block |
||
| 2593 | 2593 | ORDER BY access_start_date, access_end_date, name"; |
| 2594 | 2594 | |
| 2595 | 2595 | $result = Database::query($sql); |
| 2596 | - if (Database::num_rows($result)>0) { |
|
| 2596 | + if (Database::num_rows($result) > 0) { |
|
| 2597 | 2597 | while ($row = Database::fetch_assoc($result)) { |
| 2598 | 2598 | if (empty($sessions[$row['id']])) { |
| 2599 | 2599 | $sessions[$row['id']] = $row; |
@@ -3585,13 +3585,13 @@ discard block |
||
| 3585 | 3585 | $useExtraFields = false; |
| 3586 | 3586 | $extraFields = UserManager::get_extra_filtrable_fields(); |
| 3587 | 3587 | $extraFieldResult = array(); |
| 3588 | - if (is_array($extraFields) && count($extraFields)>0 ) { |
|
| 3588 | + if (is_array($extraFields) && count($extraFields) > 0) { |
|
| 3589 | 3589 | foreach ($extraFields as $extraField) { |
| 3590 | 3590 | $varName = 'field_'.$extraField['variable']; |
| 3591 | 3591 | if (UserManager::is_extra_field_available($extraField['variable'])) { |
| 3592 | - if (isset($_GET[$varName]) && $_GET[$varName]!='0') { |
|
| 3592 | + if (isset($_GET[$varName]) && $_GET[$varName] != '0') { |
|
| 3593 | 3593 | $useExtraFields = true; |
| 3594 | - $extraFieldResult[]= UserManager::get_extra_user_data_by_value( |
|
| 3594 | + $extraFieldResult[] = UserManager::get_extra_user_data_by_value( |
|
| 3595 | 3595 | $extraField['variable'], |
| 3596 | 3596 | $_GET[$varName] |
| 3597 | 3597 | ); |
@@ -3602,17 +3602,17 @@ discard block |
||
| 3602 | 3602 | |
| 3603 | 3603 | if ($useExtraFields) { |
| 3604 | 3604 | $finalResult = array(); |
| 3605 | - if (count($extraFieldResult)>1) { |
|
| 3606 | - for ($i=0; $i < count($extraFieldResult) -1; $i++) { |
|
| 3607 | - if (is_array($extraFieldResult[$i+1])) { |
|
| 3608 | - $finalResult = array_intersect($extraFieldResult[$i], $extraFieldResult[$i+1]); |
|
| 3605 | + if (count($extraFieldResult) > 1) { |
|
| 3606 | + for ($i = 0; $i < count($extraFieldResult) - 1; $i++) { |
|
| 3607 | + if (is_array($extraFieldResult[$i + 1])) { |
|
| 3608 | + $finalResult = array_intersect($extraFieldResult[$i], $extraFieldResult[$i + 1]); |
|
| 3609 | 3609 | } |
| 3610 | 3610 | } |
| 3611 | 3611 | } else { |
| 3612 | 3612 | $finalResult = $extraFieldResult[0]; |
| 3613 | 3613 | } |
| 3614 | 3614 | |
| 3615 | - if (is_array($finalResult) && count($finalResult)>0) { |
|
| 3615 | + if (is_array($finalResult) && count($finalResult) > 0) { |
|
| 3616 | 3616 | $whereFilter = " AND u.id IN ('".implode("','", $finalResult)."') "; |
| 3617 | 3617 | } else { |
| 3618 | 3618 | //no results |
@@ -3785,7 +3785,7 @@ discard block |
||
| 3785 | 3785 | $sql = 'DELETE FROM '.$tbl_my_friend.' |
| 3786 | 3786 | WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND friend_user_id='.$friend_id.' '.$extra_condition; |
| 3787 | 3787 | Database::query($sql); |
| 3788 | - $sql= 'DELETE FROM '.$tbl_my_friend.' |
|
| 3788 | + $sql = 'DELETE FROM '.$tbl_my_friend.' |
|
| 3789 | 3789 | WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND user_id='.$friend_id.' '.$extra_condition; |
| 3790 | 3790 | Database::query($sql); |
| 3791 | 3791 | } else { |
@@ -3986,7 +3986,7 @@ discard block |
||
| 3986 | 3986 | |
| 3987 | 3987 | if (!empty($lastConnectionDate)) { |
| 3988 | 3988 | $lastConnectionDate = Database::escape_string($lastConnectionDate); |
| 3989 | - $userConditions .= " AND u.last_login <= '$lastConnectionDate' "; |
|
| 3989 | + $userConditions .= " AND u.last_login <= '$lastConnectionDate' "; |
|
| 3990 | 3990 | } |
| 3991 | 3991 | |
| 3992 | 3992 | $courseConditions = null; |
@@ -4053,7 +4053,7 @@ discard block |
||
| 4053 | 4053 | break; |
| 4054 | 4054 | case STUDENT_BOSS : |
| 4055 | 4055 | $drhConditions = " AND friend_user_id = $userId AND " |
| 4056 | - . "relation_type = " . USER_RELATION_TYPE_BOSS; |
|
| 4056 | + . "relation_type = ".USER_RELATION_TYPE_BOSS; |
|
| 4057 | 4057 | break; |
| 4058 | 4058 | } |
| 4059 | 4059 | |
@@ -4144,7 +4144,7 @@ discard block |
||
| 4144 | 4144 | WHERE |
| 4145 | 4145 | friend_user_id = $userId AND |
| 4146 | 4146 | relation_type = $relationType AND |
| 4147 | - access_url_id = " . api_get_current_access_url_id(); |
|
| 4147 | + access_url_id = ".api_get_current_access_url_id(); |
|
| 4148 | 4148 | } else { |
| 4149 | 4149 | $sql = "SELECT user_id FROM $userRelUserTable |
| 4150 | 4150 | WHERE friend_user_id = $userId |
@@ -4426,7 +4426,7 @@ discard block |
||
| 4426 | 4426 | if (empty($years)) { |
| 4427 | 4427 | $years = 1; |
| 4428 | 4428 | } |
| 4429 | - $inactive_time = $years * 31536000; //1 year |
|
| 4429 | + $inactive_time = $years * 31536000; //1 year |
|
| 4430 | 4430 | $rs = Database::query($sql); |
| 4431 | 4431 | if (Database::num_rows($rs) > 0) { |
| 4432 | 4432 | if ($last_login_date = Database::result($rs, 0, 0)) { |
@@ -4559,7 +4559,7 @@ discard block |
||
| 4559 | 4559 | 'extra_'.$field_details[1], |
| 4560 | 4560 | $field_details[3], |
| 4561 | 4561 | $options, |
| 4562 | - array('id' => 'extra_' . $field_details[1]) |
|
| 4562 | + array('id' => 'extra_'.$field_details[1]) |
|
| 4563 | 4563 | ); |
| 4564 | 4564 | |
| 4565 | 4565 | if (!$admin_permissions) { |
@@ -4713,7 +4713,7 @@ discard block |
||
| 4713 | 4713 | $extra_field = 'extra_'.$field_details[1]; |
| 4714 | 4714 | $form->addElement('file', $extra_field, $field_details[3], null, ''); |
| 4715 | 4715 | if ($extra_file_list = UserManager::build_user_extra_file_list($user_id, $field_details[1], '', true)) { |
| 4716 | - $form->addElement('static', $extra_field . '_list', null, $extra_file_list); |
|
| 4716 | + $form->addElement('static', $extra_field.'_list', null, $extra_file_list); |
|
| 4717 | 4717 | } |
| 4718 | 4718 | if ($field_details[7] == 0) { |
| 4719 | 4719 | $form->freeze($extra_field); |
@@ -4881,7 +4881,7 @@ discard block |
||
| 4881 | 4881 | $direction = null, |
| 4882 | 4882 | $active = null, |
| 4883 | 4883 | $lastConnectionDate = null |
| 4884 | - ){ |
|
| 4884 | + ) { |
|
| 4885 | 4885 | return self::getUsersFollowedByUser( |
| 4886 | 4886 | $userId, |
| 4887 | 4887 | $userStatus, |
@@ -5088,12 +5088,12 @@ discard block |
||
| 5088 | 5088 | if (!empty($_SERVER['HTTPS'])) { |
| 5089 | 5089 | $url = 'https://secure.gravatar.com/avatar/'; |
| 5090 | 5090 | } |
| 5091 | - $url .= md5( strtolower( trim( $email ) ) ); |
|
| 5091 | + $url .= md5(strtolower(trim($email))); |
|
| 5092 | 5092 | $url .= "?s=$s&d=$d&r=$r"; |
| 5093 | - if ( $img ) { |
|
| 5094 | - $url = '<img src="' . $url . '"'; |
|
| 5095 | - foreach ( $atts as $key => $val ) |
|
| 5096 | - $url .= ' ' . $key . '="' . $val . '"'; |
|
| 5093 | + if ($img) { |
|
| 5094 | + $url = '<img src="'.$url.'"'; |
|
| 5095 | + foreach ($atts as $key => $val) |
|
| 5096 | + $url .= ' '.$key.'="'.$val.'"'; |
|
| 5097 | 5097 | $url .= ' />'; |
| 5098 | 5098 | } |
| 5099 | 5099 | return $url; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // setting breadcrumbs |
| 26 | 26 | $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
| 27 | -$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList')); |
|
| 27 | +$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList')); |
|
| 28 | 28 | |
| 29 | 29 | // Database Table Definitions |
| 30 | 30 | $tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
@@ -44,17 +44,17 @@ discard block |
||
| 44 | 44 | $isAdmin = UserManager::is_admin($user_id); |
| 45 | 45 | if ($isAdmin) { |
| 46 | 46 | $userStatus = PLATFORM_ADMIN; |
| 47 | - $tool_name= get_lang('AssignUsersToPlatformAdministrator'); |
|
| 47 | + $tool_name = get_lang('AssignUsersToPlatformAdministrator'); |
|
| 48 | 48 | } else if ($user_info['status'] == SESSIONADMIN) { |
| 49 | - $tool_name= get_lang('AssignUsersToSessionsAdministrator'); |
|
| 50 | -} else if ($user_info['status'] == STUDENT_BOSS) { |
|
| 51 | - $tool_name= get_lang('AssignUsersToBoss'); |
|
| 49 | + $tool_name = get_lang('AssignUsersToSessionsAdministrator'); |
|
| 50 | +} else if ($user_info['status'] == STUDENT_BOSS) { |
|
| 51 | + $tool_name = get_lang('AssignUsersToBoss'); |
|
| 52 | 52 | } else { |
| 53 | - $tool_name= get_lang('AssignUsersToHumanResourcesManager'); |
|
| 53 | + $tool_name = get_lang('AssignUsersToHumanResourcesManager'); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $add_type = 'multiple'; |
| 57 | -if (isset($_GET['add_type']) && $_GET['add_type']!='') { |
|
| 57 | +if (isset($_GET['add_type']) && $_GET['add_type'] != '') { |
|
| 58 | 58 | $add_type = Security::remove_XSS($_REQUEST['add_type']); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | function search_users($needle, $type) |
| 66 | 66 | { |
| 67 | - global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus; |
|
| 67 | + global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus; |
|
| 68 | 68 | |
| 69 | 69 | $xajax_response = new xajaxResponse(); |
| 70 | 70 | $return = ''; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id) |
| 103 | 103 | WHERE |
| 104 | 104 | ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND |
| 105 | - status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND |
|
| 105 | + status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND |
|
| 106 | 106 | user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) |
| 107 | 107 | $without_assigned_users AND |
| 108 | 108 | access_url_id = ".api_get_current_access_url_id()." |
@@ -114,15 +114,15 @@ discard block |
||
| 114 | 114 | FROM $tbl_user user |
| 115 | 115 | WHERE |
| 116 | 116 | ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND |
| 117 | - status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND |
|
| 117 | + status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND |
|
| 118 | 118 | user_id NOT IN ($user_anonymous, $current_user_id, $user_id) |
| 119 | 119 | $without_assigned_users |
| 120 | 120 | $order_clause |
| 121 | 121 | "; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - $rs = Database::query($sql); |
|
| 125 | - $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
| 124 | + $rs = Database::query($sql); |
|
| 125 | + $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return)); |
|
| 126 | 126 | |
| 127 | 127 | if ($type == 'single') { |
| 128 | 128 | $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
@@ -141,10 +141,10 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | switch ($userStatus) { |
| 143 | 143 | case DRH: |
| 144 | - $sql .= " user.status <> 6 AND user.status <> " . DRH; |
|
| 144 | + $sql .= " user.status <> 6 AND user.status <> ".DRH; |
|
| 145 | 145 | break; |
| 146 | 146 | case STUDENT_BOSS: |
| 147 | - $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS; |
|
| 147 | + $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS; |
|
| 148 | 148 | break; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,12 +161,12 @@ discard block |
||
| 161 | 161 | $return .= '...<br />'; |
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | - $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
| 164 | + $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return)); |
|
| 165 | 165 | } else { |
| 166 | 166 | $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">'; |
| 167 | - while($user = Database :: fetch_array($rs)) { |
|
| 167 | + while ($user = Database :: fetch_array($rs)) { |
|
| 168 | 168 | $person_name = api_get_person_name($user['firstname'], $user['lastname']); |
| 169 | - $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>'; |
|
| 169 | + $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>'; |
|
| 170 | 170 | } |
| 171 | 171 | $return .= '</select>'; |
| 172 | 172 | $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return)); |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | } |
| 244 | 244 | </script>'; |
| 245 | 245 | |
| 246 | -$formSent=0; |
|
| 246 | +$formSent = 0; |
|
| 247 | 247 | $errorMsg = ''; |
| 248 | 248 | $UserList = array(); |
| 249 | 249 | |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id); |
| 260 | 260 | $searchForm->addHeader(get_lang('AdvancedSearch')); |
| 261 | -$renderer =& $searchForm->defaultRenderer(); |
|
| 261 | +$renderer = & $searchForm->defaultRenderer(); |
|
| 262 | 262 | |
| 263 | 263 | $searchForm->addElement('hidden', 'user', $user_id); |
| 264 | 264 | foreach ($filters as $param) { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $affected_rows = 0; |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - if ($affected_rows) { |
|
| 303 | + if ($affected_rows) { |
|
| 304 | 304 | $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully'); |
| 305 | 305 | } |
| 306 | 306 | } |
@@ -312,18 +312,18 @@ discard block |
||
| 312 | 312 | $actionsLeft = ''; |
| 313 | 313 | if ($userStatus != STUDENT_BOSS) { |
| 314 | 314 | $actionsLeft = Display::url( |
| 315 | - Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ), |
|
| 315 | + Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM), |
|
| 316 | 316 | "dashboard_add_courses_to_user.php?user=$user_id" |
| 317 | 317 | ); |
| 318 | 318 | |
| 319 | 319 | $actionsLeft .= Display::url( |
| 320 | - Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM ) , |
|
| 320 | + Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM), |
|
| 321 | 321 | "dashboard_add_sessions_to_user.php?user=$user_id" |
| 322 | 322 | ); |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | $actionsRight = Display::url( |
| 326 | - '<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'), |
|
| 326 | + '<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'), |
|
| 327 | 327 | '#', |
| 328 | 328 | array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search') |
| 329 | 329 | ); |
@@ -360,13 +360,13 @@ discard block |
||
| 360 | 360 | $assigned_users_id = array_keys($assigned_users_to_hrm); |
| 361 | 361 | $without_assigned_users = ''; |
| 362 | 362 | if (count($assigned_users_id) > 0) { |
| 363 | - $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND "; |
|
| 363 | + $without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND "; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | $search_user = ''; |
| 367 | 367 | if (!empty($firstLetterUser)) { |
| 368 | 368 | $needle = Database::escape_string($firstLetterUser); |
| 369 | - $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; |
|
| 369 | + $search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | $sqlConditions = null; |
@@ -406,12 +406,12 @@ discard block |
||
| 406 | 406 | $sqlConditions |
| 407 | 407 | ORDER BY firstname "; |
| 408 | 408 | } |
| 409 | -$result = Database::query($sql); |
|
| 409 | +$result = Database::query($sql); |
|
| 410 | 410 | ?> |
| 411 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
| 411 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>> |
|
| 412 | 412 | <input type="hidden" name="formSent" value="1" /> |
| 413 | 413 | <?php |
| 414 | -if(!empty($msg)) { |
|
| 414 | +if (!empty($msg)) { |
|
| 415 | 415 | Display::display_normal_message($msg); //main API |
| 416 | 416 | } |
| 417 | 417 | ?> |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | <select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15"> |
| 427 | 427 | <?php while ($enreg = Database::fetch_array($result)) { |
| 428 | 428 | $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?> |
| 429 | - <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>> |
|
| 429 | + <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>> |
|
| 430 | 430 | <?php echo $person_name.' ('.$enreg['username'].')'; ?> |
| 431 | 431 | </option> |
| 432 | 432 | <?php } ?> |
@@ -439,8 +439,8 @@ discard block |
||
| 439 | 439 | </div> |
| 440 | 440 | <div class="col-md-4"> |
| 441 | 441 | <div class="code-course"> |
| 442 | - <?php if($add_type == 'multiple') { ?> |
|
| 443 | - <p><?php echo get_lang('FirstLetterUser');?></p> |
|
| 442 | + <?php if ($add_type == 'multiple') { ?> |
|
| 443 | + <p><?php echo get_lang('FirstLetterUser'); ?></p> |
|
| 444 | 444 | <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')"> |
| 445 | 445 | <option value="%">--</option> |
| 446 | 446 | <?php echo Display::get_alphabet_options($firstLetterUser); ?> |
@@ -492,10 +492,10 @@ discard block |
||
| 492 | 492 | <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" > |
| 493 | 493 | <?php |
| 494 | 494 | if (is_array($assigned_users_to_hrm)) { |
| 495 | - foreach($assigned_users_to_hrm as $enreg) { |
|
| 495 | + foreach ($assigned_users_to_hrm as $enreg) { |
|
| 496 | 496 | $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); |
| 497 | 497 | ?> |
| 498 | - <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>> |
|
| 498 | + <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>> |
|
| 499 | 499 | <?php echo $person_name.' ('.$enreg['username'].')'; ?> |
| 500 | 500 | </option> |
| 501 | 501 | <?php } |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | </script>'; |
| 70 | 70 | |
| 71 | -$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">'; |
|
| 72 | -$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>'; |
|
| 71 | +$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">'; |
|
| 72 | +$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>'; |
|
| 73 | 73 | $htmlHeadXtra[] = '<script> |
| 74 | 74 | $(document).ready(function() { |
| 75 | 75 | var $image = $("#previewImage"); |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | if (api_get_setting('login_is_email') == 'true') { |
| 196 | - $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); |
|
| 196 | + $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); |
|
| 197 | 197 | $form->addRule('email', get_lang('UserTaken'), 'username_available', $user_data['username']); |
| 198 | 198 | } |
| 199 | 199 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | |
| 208 | 208 | // Picture |
| 209 | 209 | $form->addElement('file', 'picture', get_lang('AddPicture'), array('id' => 'picture', 'class' => 'picture-form')); |
| 210 | -$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif'); |
|
| 210 | +$allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif'); |
|
| 211 | 211 | |
| 212 | 212 | $form->addHtml('<div class="form-group"> |
| 213 | 213 | <label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label> |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | if (api_get_setting('login_is_email') != 'true') { |
| 239 | 239 | $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH)); |
| 240 | 240 | $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required'); |
| 241 | - $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); |
|
| 241 | + $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); |
|
| 242 | 242 | $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username'); |
| 243 | 243 | $form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']); |
| 244 | 244 | } |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | $form->addElement('radio', 'reset_password', null, get_lang('AutoGeneratePassword'), 1); |
| 277 | 277 | $group = array(); |
| 278 | -$group[] =$form->createElement('radio', 'reset_password', null, get_lang('EnterPassword'), 2); |
|
| 278 | +$group[] = $form->createElement('radio', 'reset_password', null, get_lang('EnterPassword'), 2); |
|
| 279 | 279 | $group[] = $form->createElement( |
| 280 | 280 | 'password', |
| 281 | 281 | 'password', |
@@ -309,10 +309,10 @@ discard block |
||
| 309 | 309 | // Platform admin |
| 310 | 310 | if (api_is_platform_admin()) { |
| 311 | 311 | $group = array(); |
| 312 | - $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1); |
|
| 313 | - $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0); |
|
| 312 | + $group[] = $form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1); |
|
| 313 | + $group[] = $form->createElement('radio', 'platform_admin', null, get_lang('No'), 0); |
|
| 314 | 314 | |
| 315 | - $user_data['status'] == 1 ? $display = 'block':$display = 'none'; |
|
| 315 | + $user_data['status'] == 1 ? $display = 'block' : $display = 'none'; |
|
| 316 | 316 | |
| 317 | 317 | $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">'); |
| 318 | 318 | $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false); |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | if (!$user_data['platform_admin']) { |
| 337 | 337 | // Expiration Date |
| 338 | 338 | $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0); |
| 339 | - $group = array (); |
|
| 339 | + $group = array(); |
|
| 340 | 340 | $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1); |
| 341 | 341 | $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();')); |
| 342 | 342 | $form->addGroup($group, 'max_member_group', null, '', false); |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | if ($studentBoss) { |
| 355 | 355 | foreach ($studentBoss as $bossId => $userData) { |
| 356 | 356 | $bossInfo = api_get_user_info($userData['user_id']); |
| 357 | - $studentBossToSelect[$bossInfo['user_id']] = $bossInfo['complete_name_with_username']; |
|
| 357 | + $studentBossToSelect[$bossInfo['user_id']] = $bossInfo['complete_name_with_username']; |
|
| 358 | 358 | } |
| 359 | 359 | } |
| 360 | 360 | |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | $jquery_ready_content = $returnParams['jquery_ready_content']; |
| 372 | 372 | |
| 373 | 373 | // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function |
| 374 | -$htmlHeadXtra[] ='<script> |
|
| 374 | +$htmlHeadXtra[] = '<script> |
|
| 375 | 375 | $(document).ready(function(){ |
| 376 | 376 | '.$jquery_ready_content.' |
| 377 | 377 | }); |