From a0832fb70466533d834c07b9fd739a74fa0e0d5a Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 12 Aug 2019 11:40:19 +0200 Subject: [PATCH] Minor - format code --- main/user/subscribe_user.php | 20 ++++++++++---------- main/user/user.php | 30 ++++++++++++++---------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php index b133901641..c6ad2bdff8 100755 --- a/main/user/subscribe_user.php +++ b/main/user/subscribe_user.php @@ -31,7 +31,7 @@ if (!api_is_allowed_to_edit()) { } $tool_name = get_lang('SubscribeUserToCourse'); -$type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT; +$type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT; $keyword = isset($_REQUEST['keyword']) ? Security::remove_XSS($_REQUEST['keyword']) : null; $courseInfo = api_get_course_info(); @@ -501,7 +501,7 @@ function get_user_data($from, $number_of_items, $column, $direction) field_values.field_id = '".intval($field_identification[0])."' AND field_values.value = '".Database::escape_string($field_identification[1])."'"; } else { - $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." "; + $sql .= "WHERE cu.user_id IS NULL AND u.status <> ".DRH." "; } // adding a teacher NOT trough a session on a portal with multiple URLs @@ -529,7 +529,7 @@ function get_user_data($from, $number_of_items, $column, $direction) field_values.field_id = '".intval($field_identification[0])."' AND field_values.value = '".Database::escape_string($field_identification[1])."'"; } else { - $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id "; + $sql .= "WHERE cu.user_id IS NULL AND u.status <> ".DRH." AND access_url_id= $url_access_id "; } } } @@ -542,8 +542,8 @@ function get_user_data($from, $number_of_items, $column, $direction) LEFT JOIN $tbl_session_rel_course_user cu ON u.user_id = cu.user_id AND - c_id ='".$courseId."' AND - session_id ='".$sessionId."' "; + c_id = $courseId AND + session_id = $sessionId "; if (api_is_multiple_url_enabled()) { $sql .= " INNER JOIN $tbl_url_rel_user as url_rel_user ON (url_rel_user.user_id = u.user_id) "; @@ -566,7 +566,7 @@ function get_user_data($from, $number_of_items, $column, $direction) } else { $sql .= "WHERE cu.user_id IS NULL AND - u.status<>".DRH." AND + u.status <> ".DRH." AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) "; } if (api_is_multiple_url_enabled()) { @@ -578,7 +578,7 @@ function get_user_data($from, $number_of_items, $column, $direction) LEFT JOIN $course_user_table cu ON u.user_id = cu.user_id AND - c_id ='".$courseId."'"; + c_id = $courseId "; // applying the filter of the additional user profile fields if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) { @@ -588,11 +588,11 @@ function get_user_data($from, $number_of_items, $column, $direction) ON field_values.item_id = u.user_id WHERE cu.user_id IS NULL AND - u.status<>".DRH." AND + u.status <> ".DRH." AND field_values.field_id = '".intval($field_identification[0])."' AND field_values.value = '".Database::escape_string($field_identification[1])."'"; } else { - $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." "; + $sql .= "WHERE cu.user_id IS NULL AND u.status <> ".DRH." "; } //showing only the courses of the current Chamilo access_url_id @@ -622,7 +622,7 @@ function get_user_data($from, $number_of_items, $column, $direction) access_url_id = $url_access_id "; } else { - $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id "; + $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id = $url_access_id "; } } } diff --git a/main/user/user.php b/main/user/user.php index e912f2b9c1..126fa555d0 100755 --- a/main/user/user.php +++ b/main/user/user.php @@ -28,8 +28,6 @@ if (!api_is_platform_admin(true)) { } } -/* Constants and variables */ -$course_code = api_get_course_id(); $sessionId = api_get_session_id(); $is_western_name_order = api_is_western_name_order(); $sort_by_first_name = api_sort_by_first_name(); @@ -38,7 +36,7 @@ $user_id = api_get_user_id(); $_user = api_get_user_info(); $courseCode = $course_info['code']; $courseId = $course_info['real_id']; -$type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT; +$type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT; $canEditUsers = api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' || api_is_platform_admin(); // Can't auto unregister from a session @@ -109,7 +107,6 @@ if (isset($_GET['action'])) { if (!$canRead) { api_not_allowed(); } - $table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); $table_users = Database::get_main_table(TABLE_MAIN_USER); $is_western_name_order = api_is_western_name_order(); @@ -353,7 +350,7 @@ if (isset($_GET['action'])) { $user[$key] = $extra_value; } } - if ($_GET['format'] == 'pdf') { + if ($_GET['format'] === 'pdf') { $user_info = api_get_user_info($user['user_id']); $user_image = ''; @@ -426,20 +423,20 @@ if (api_is_allowed_to_edit(null, true)) { if (isset($_GET['user_id']) && is_numeric($_GET['user_id']) && ($_GET['user_id'] != $_user['user_id'] || api_is_platform_admin()) ) { - $user_id = intval($_GET['user_id']); + $user_id = (int) $_GET['user_id']; $tbl_user = Database::get_main_table(TABLE_MAIN_USER); $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); - $sql = 'SELECT user.user_id - FROM '.$tbl_user.' user - INNER JOIN '.$tbl_session_rel_user.' reluser - ON user.user_id = reluser.user_id AND reluser.relation_type<>'.SESSION_RELATION_TYPE_RRHH.' - INNER JOIN '.$tbl_session_rel_course.' rel_course + $sql = "SELECT user.user_id + FROM $tbl_user user + INNER JOIN $tbl_session_rel_user reluser + ON user.user_id = reluser.user_id AND reluser.relation_type <> ".SESSION_RELATION_TYPE_RRHH." + INNER JOIN $tbl_session_rel_course rel_course ON rel_course.session_id = reluser.session_id WHERE - user.user_id = "'.$user_id.'" AND - rel_course.c_id = "'.$courseId.'"'; + user.user_id = $user_id AND + rel_course.c_id = $courseId "; $result = Database::query($sql); $row = Database::fetch_array($result, 'ASSOC'); @@ -558,7 +555,7 @@ if (api_is_allowed_to_edit(null, true)) { } /* Header */ -if (isset($origin) && $origin == 'learnpath') { +if (isset($origin) && $origin === 'learnpath') { Display::display_reduced_header(); } else { if (isset($_GET['keyword']) && !empty($_GET['keyword'])) { @@ -775,17 +772,18 @@ function get_user_data($from, $number_of_items, $column, $direction) { global $is_western_name_order; global $extraFields; - $canEditUsers = api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' || api_is_platform_admin(); $type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT; $course_info = api_get_course_info(); $sessionId = api_get_session_id(); $course_code = $course_info['code']; $a_users = []; $limit = null; + $from = (int) $from; + $number_of_items = (int) $number_of_items; // limit if (!isset($_GET['keyword']) || empty($_GET['keyword'])) { - $limit = 'LIMIT '.intval($from).','.intval($number_of_items); + $limit = 'LIMIT '.$from.','.$number_of_items; } if (!in_array($direction, ['ASC', 'DESC'])) {