From d0bb36beb801dde62fd2d38c425befd778bee342 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 16 Jan 2013 19:19:53 +0100 Subject: [PATCH] Minor - using api_is_multiple_url_enabled() instead of the $_configuration array --- main/inc/lib/tracking.lib.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index a195b70616..f6c9488395 100644 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -1247,7 +1247,7 @@ class Tracking { $sql = 'SELECT DISTINCT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id.' AND status=2'; global $_configuration; - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); $access_url_id = api_get_current_access_url_id(); if ($access_url_id != -1){ @@ -1274,7 +1274,7 @@ class Tracking { INNER JOIN ' . $tbl_course . ' as course ON course.code = session_course.course_code'; - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); $access_url_id = api_get_current_access_url_id(); if ($access_url_id != -1){ @@ -1292,10 +1292,10 @@ class Tracking { if (!empty ($id_session)) { $sql .= ' WHERE session_course.id_session=' . $id_session; - if ($_configuration['multiple_access_urls']) + if (api_is_multiple_url_enabled()) $sql .= ' AND access_url_id = '.$access_url_id; } else { - if ($_configuration['multiple_access_urls']) + if (api_is_multiple_url_enabled()) $sql .= ' WHERE access_url_id = '.$access_url_id; } @@ -1327,7 +1327,7 @@ class Tracking { WHERE id_coach=' . $coach_id; global $_configuration; - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $access_url_id = api_get_current_access_url_id(); if ($access_url_id != -1){ @@ -1351,7 +1351,7 @@ class Tracking { AND session_course_user.id_user=' . $coach_id.' AND session_course_user.status=2'; global $_configuration; - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $access_url_id = api_get_current_access_url_id(); if ($access_url_id != -1){ @@ -2136,7 +2136,7 @@ class Tracking { $user_id = intval($user_id); // get course list - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $sql = 'SELECT cu.course_code as code, title FROM '.$tbl_course_user.' cu INNER JOIN '.$tbl_access_rel_course.' a ON(a.course_code = cu.course_code) INNER JOIN '.$tbl_course.' c ON( cu.course_code = c.code) WHERE user_id='.$user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' AND access_url_id = '.api_get_current_access_url_id().' ORDER BY title '; @@ -2152,7 +2152,7 @@ class Tracking { } // Get the list of sessions where the user is subscribed as student - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $sql = 'SELECT DISTINCT cu.course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a ON(a.session_id = cu.id_session) INNER JOIN '.$tbl_session.' s ON(s.id = a.session_id) WHERE id_user='.$user_id.' AND access_url_id = '.api_get_current_access_url_id().' ORDER BY name '; } else { @@ -3575,7 +3575,7 @@ class TrackingCourseLog { $condition_user .= " AND (user.firstname LIKE '%".$keyword."%' OR user.lastname LIKE '%".$keyword."%' OR user.username LIKE '%".$keyword."%' OR user.email LIKE '%".$keyword."%' ) "; } - if ($_configuration['multiple_access_urls']) { + if (api_is_multiple_url_enabled()) { $url_table = ", ".$tbl_url_rel_user."as url_users"; $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'"; }