Minor - format code

pull/2981/head
Julio Montoya 6 years ago
parent a084735882
commit a0832fb704
  1. 8
      main/user/subscribe_user.php
  2. 30
      main/user/user.php

@ -31,7 +31,7 @@ if (!api_is_allowed_to_edit()) {
} }
$tool_name = get_lang('SubscribeUserToCourse'); $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; $keyword = isset($_REQUEST['keyword']) ? Security::remove_XSS($_REQUEST['keyword']) : null;
$courseInfo = api_get_course_info(); $courseInfo = api_get_course_info();
@ -542,8 +542,8 @@ function get_user_data($from, $number_of_items, $column, $direction)
LEFT JOIN $tbl_session_rel_course_user cu LEFT JOIN $tbl_session_rel_course_user cu
ON ON
u.user_id = cu.user_id AND u.user_id = cu.user_id AND
c_id ='".$courseId."' AND c_id = $courseId AND
session_id ='".$sessionId."' "; session_id = $sessionId ";
if (api_is_multiple_url_enabled()) { 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) "; $sql .= " INNER JOIN $tbl_url_rel_user as url_rel_user ON (url_rel_user.user_id = u.user_id) ";
@ -578,7 +578,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
LEFT JOIN $course_user_table cu LEFT JOIN $course_user_table cu
ON ON
u.user_id = cu.user_id AND u.user_id = cu.user_id AND
c_id ='".$courseId."'"; c_id = $courseId ";
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) { if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {

@ -28,8 +28,6 @@ if (!api_is_platform_admin(true)) {
} }
} }
/* Constants and variables */
$course_code = api_get_course_id();
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$is_western_name_order = api_is_western_name_order(); $is_western_name_order = api_is_western_name_order();
$sort_by_first_name = api_sort_by_first_name(); $sort_by_first_name = api_sort_by_first_name();
@ -38,7 +36,7 @@ $user_id = api_get_user_id();
$_user = api_get_user_info(); $_user = api_get_user_info();
$courseCode = $course_info['code']; $courseCode = $course_info['code'];
$courseId = $course_info['real_id']; $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(); $canEditUsers = api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' || api_is_platform_admin();
// Can't auto unregister from a session // Can't auto unregister from a session
@ -109,7 +107,6 @@ if (isset($_GET['action'])) {
if (!$canRead) { if (!$canRead) {
api_not_allowed(); api_not_allowed();
} }
$table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$table_users = Database::get_main_table(TABLE_MAIN_USER); $table_users = Database::get_main_table(TABLE_MAIN_USER);
$is_western_name_order = api_is_western_name_order(); $is_western_name_order = api_is_western_name_order();
@ -353,7 +350,7 @@ if (isset($_GET['action'])) {
$user[$key] = $extra_value; $user[$key] = $extra_value;
} }
} }
if ($_GET['format'] == 'pdf') { if ($_GET['format'] === 'pdf') {
$user_info = api_get_user_info($user['user_id']); $user_info = api_get_user_info($user['user_id']);
$user_image = '<img src="'.$user_info['avatar'].'" width ="'.$user_image_pdf_size.'px" />'; $user_image = '<img src="'.$user_info['avatar'].'" width ="'.$user_image_pdf_size.'px" />';
@ -426,20 +423,20 @@ if (api_is_allowed_to_edit(null, true)) {
if (isset($_GET['user_id']) && is_numeric($_GET['user_id']) && if (isset($_GET['user_id']) && is_numeric($_GET['user_id']) &&
($_GET['user_id'] != $_user['user_id'] || api_is_platform_admin()) ($_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_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$sql = 'SELECT user.user_id $sql = "SELECT user.user_id
FROM '.$tbl_user.' user FROM $tbl_user user
INNER JOIN '.$tbl_session_rel_user.' reluser INNER JOIN $tbl_session_rel_user reluser
ON user.user_id = reluser.user_id AND reluser.relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ON user.user_id = reluser.user_id AND reluser.relation_type <> ".SESSION_RELATION_TYPE_RRHH."
INNER JOIN '.$tbl_session_rel_course.' rel_course INNER JOIN $tbl_session_rel_course rel_course
ON rel_course.session_id = reluser.session_id ON rel_course.session_id = reluser.session_id
WHERE WHERE
user.user_id = "'.$user_id.'" AND user.user_id = $user_id AND
rel_course.c_id = "'.$courseId.'"'; rel_course.c_id = $courseId ";
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result, 'ASSOC'); $row = Database::fetch_array($result, 'ASSOC');
@ -558,7 +555,7 @@ if (api_is_allowed_to_edit(null, true)) {
} }
/* Header */ /* Header */
if (isset($origin) && $origin == 'learnpath') { if (isset($origin) && $origin === 'learnpath') {
Display::display_reduced_header(); Display::display_reduced_header();
} else { } else {
if (isset($_GET['keyword']) && !empty($_GET['keyword'])) { 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 $is_western_name_order;
global $extraFields; 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; $type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT;
$course_info = api_get_course_info(); $course_info = api_get_course_info();
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$course_code = $course_info['code']; $course_code = $course_info['code'];
$a_users = []; $a_users = [];
$limit = null; $limit = null;
$from = (int) $from;
$number_of_items = (int) $number_of_items;
// limit // limit
if (!isset($_GET['keyword']) || empty($_GET['keyword'])) { 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'])) { if (!in_array($direction, ['ASC', 'DESC'])) {

Loading…
Cancel
Save