Minor - format code.

1.9.x
Julio Montoya 11 years ago
parent 4751c5375b
commit dd9a3e9f31
  1. 6
      main/admin/dashboard_add_sessions_to_user.php
  2. 29
      main/inc/lib/course.lib.php
  3. 5
      main/inc/lib/tracking.lib.php

@ -177,10 +177,12 @@ echo '</div>';
echo Display::page_header(sprintf(get_lang('AssignSessionsToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])));
$assigned_sessions_to_hrm = SessionManager::get_sessions_followed_by_drh($user_id);
$assigned_sessions_id = array_keys($assigned_sessions_to_hrm);
$without_assigned_sessions = '';
if (count($assigned_sessions_id) > 0) {
$without_assigned_sessions = " AND s.id NOT IN(".implode(',',$assigned_sessions_id).")";
$without_assigned_sessions = " AND s.id NOT IN (".implode(',',$assigned_sessions_id).") ";
}
$needle = '%';
@ -189,7 +191,7 @@ if (isset($_POST['firstLetterSession'])) {
$needle = "$needle%";
}
if ($_configuration['multiple_access_urls']) {
if (api_is_multiple_url_enabled()) {
$sql = " SELECT s.id, s.name FROM $tbl_session s LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()."
ORDER BY s.name";

@ -1022,7 +1022,12 @@ class CourseManager
* @param bool True for checking inside sessions too, by default is not checked
* @return bool true if the user is registered in the course, false otherwise
*/
public static function is_user_subscribed_in_course($user_id, $course_code = null, $in_a_session = false, $session_id = null) {
public static function is_user_subscribed_in_course(
$user_id,
$course_code = null,
$in_a_session = false,
$session_id = null
) {
$user_id = intval($user_id);
@ -1044,25 +1049,31 @@ class CourseManager
$result = Database::fetch_array(Database::query($sql));
if (!empty($result)) {
return true; // The user has been registered in this course.
// The user has been registered in this course.
return true;
}
if (!$in_a_session) {
return false; // The user has not been registered in this course.
// The user has not been registered in this course.
return false;
}
if (Database::num_rows(Database::query('SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
' WHERE id_user = '.$user_id.' '.$condition_course.' ')) > 0) {
$sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
' WHERE id_user = '.$user_id.' '.$condition_course;
if (Database::num_rows(Database::query($sql)) > 0) {
return true;
}
if (Database::num_rows(Database::query('SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
' WHERE id_user = '.$user_id.' AND status=2 '.$condition_course.' ')) > 0) {
$sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
' WHERE id_user = '.$user_id.' AND status=2 '.$condition_course;
if (Database::num_rows(Database::query($sql)) > 0) {
return true;
}
if (Database::num_rows(Database::query('SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION).
' WHERE id='.$session_id.' AND id_coach='.$user_id)) > 0) {
$sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION).
' WHERE id='.$session_id.' AND id_coach='.$user_id;
if (Database::num_rows(Database::query($sql)) > 0) {
return true;
}

@ -160,7 +160,8 @@ class Tracking
* @param int Student id
* @param bool Show a warning message (optional)
* @param bool True for returning results in timestamp (optional)
* @return string|int|bool Date format long without day, false if there are no connections or timestamp if parameter $return_timestamp is true
* @return string|int|bool Date format long without day, false if there are no connections or
* timestamp if parameter $return_timestamp is true
*/
public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) {
$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
@ -169,7 +170,7 @@ class Tracking
ORDER BY login_date DESC LIMIT 0,1';
$rs = Database::query($sql);
if(Database::num_rows($rs)>0) {
if (Database::num_rows($rs) > 0) {
if ($last_login_date = Database::result($rs, 0, 0)) {
$last_login_date = api_get_local_time($last_login_date);
if ($return_timestamp) {

Loading…
Cancel
Save