Skip to content

Commit

Permalink
Internal: Remove api_is_multiple_url_enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@AngelFQC
AngelFQC committed Jul 18, 2024
1 parent 16307eb commit 74b4426
Show file tree
Hide file tree
Showing 45 changed files with 1,115 additions and 2,258 deletions.
21 changes: 8 additions & 13 deletions public/main/admin/course_edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,14 @@
}

// Get all possible teachers without the course teachers
if (api_is_multiple_url_enabled()) {
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.id as user_id,lastname,firstname
FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user
ON (u.id=url_rel_user.user_id)
WHERE
url_rel_user.access_url_id = $urlId AND
status = 1".$order_clause;
} else {
$sql = "SELECT id as user_id, lastname, firstname
FROM $table_user WHERE status='1'".$order_clause;
}
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.id as user_id,lastname,firstname
FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user
ON (u.id=url_rel_user.user_id)
WHERE
url_rel_user.access_url_id = $urlId AND
status = 1".$order_clause;
$courseInfo['tutor_name'] = null;

$res = Database::query($sql);
Expand Down
20 changes: 9 additions & 11 deletions public/main/admin/course_information.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,15 @@ function get_course_usage($course, $session_id = 0)
$table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT *, cu.status as course_status
FROM $table_course_user cu, $table_user u";
if (api_is_multiple_url_enabled()) {
$sql .= " INNER JOIN ".Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER)." url_rel_user
ON
u.id = url_rel_user.user_id AND
url_rel_user.access_url_id = ".api_get_current_access_url_id();
}
$sql .= " WHERE
cu.user_id = u.id AND
cu.c_id = '".$courseId."' AND
cu.relation_type <> ".COURSE_RELATION_TYPE_RRHH;
FROM $table_course_user cu, $table_user u
INNER JOIN ".Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER)." url_rel_user
ON
u.id = url_rel_user.user_id AND
url_rel_user.access_url_id = ".api_get_current_access_url_id()."
WHERE
cu.user_id = u.id AND
cu.c_id = '".$courseId."' AND
cu.relation_type <> ".COURSE_RELATION_TYPE_RRHH;
$res = Database::query($sql);
$is_western_name_order = api_is_western_name_order();
if (Database::num_rows($res) > 0) {
Expand Down
8 changes: 2 additions & 6 deletions public/main/admin/course_list.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
INNER JOIN $tblCourseCategory category ON course_rel_category.course_category_id = category.id ";
}

if ((api_is_platform_admin() || api_is_session_admin()) &&
api_is_multiple_url_enabled() && -1 != api_get_current_access_url_id()
) {
if ((api_is_platform_admin() || api_is_session_admin())) {
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
ON (course.id = url_rel_course.c_id)";
Expand Down Expand Up @@ -121,9 +119,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
}

// Adding the filter to see the user's only of the current access_url.
if ((api_is_platform_admin() || api_is_session_admin()) &&
api_is_multiple_url_enabled() && -1 != api_get_current_access_url_id()
) {
if ((api_is_platform_admin() || api_is_session_admin())) {
$sql .= ' AND url_rel_course.access_url_id='.api_get_current_access_url_id();
}

Expand Down
13 changes: 5 additions & 8 deletions public/main/admin/course_list_admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,10 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
}

$sql = "$select FROM $table course";
if (api_is_multiple_url_enabled()) {
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
ON (course.id = url_rel_course.c_id)";
}

$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
ON (course.id = url_rel_course.c_id)";

$tableCourseRelUser = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$sql .= "
Expand Down Expand Up @@ -119,9 +118,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
}

// Adding the filter to see the user's only of the current access_url.
if (api_is_multiple_url_enabled()) {
$sql .= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();
}
$sql .= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();

if ($addTeacherColumn) {
$teachers = isset($_GET['course_teachers']) ? $_GET['course_teachers'] : [];
Expand Down
45 changes: 15 additions & 30 deletions public/main/admin/dashboard_add_courses_to_user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,13 @@ function search_courses($needle, $type)
$without_assigned_courses = ' AND c.code NOT IN('.implode(',', $assigned_courses_code).')';
}

if (api_is_multiple_url_enabled()) {
$sql = "SELECT c.code, c.title
FROM $tbl_course c
LEFT JOIN $tbl_course_rel_access_url a
ON (a.c_id = c.id)
WHERE
c.code LIKE '$needle%' $without_assigned_courses AND
access_url_id = ".api_get_current_access_url_id();
} else {
$sql = "SELECT c.code, c.title
FROM $tbl_course c
WHERE
c.code LIKE '$needle%'
$without_assigned_courses ";
}
$sql = "SELECT c.code, c.title
FROM $tbl_course c
LEFT JOIN $tbl_course_rel_access_url a
ON (a.c_id = c.id)
WHERE
c.code LIKE '$needle%' $without_assigned_courses AND
access_url_id = ".api_get_current_access_url_id();

$rs = Database::query($sql);

Expand Down Expand Up @@ -205,21 +197,14 @@ function remove_item(origin) {
$needle = Database::escape_string($firstLetter.'%');
}

if (api_is_multiple_url_enabled()) {
$sql = " SELECT c.code, c.title
FROM $tbl_course c
LEFT JOIN $tbl_course_rel_access_url a
ON (a.c_id = c.id)
WHERE
c.code LIKE '$needle' $without_assigned_courses AND
access_url_id = ".api_get_current_access_url_id().'
ORDER BY c.title';
} else {
$sql = " SELECT c.code, c.title
FROM $tbl_course c
WHERE c.code LIKE '$needle' $without_assigned_courses
ORDER BY c.title";
}
$sql = " SELECT c.code, c.title
FROM $tbl_course c
LEFT JOIN $tbl_course_rel_access_url a
ON (a.c_id = c.id)
WHERE
c.code LIKE '$needle' $without_assigned_courses AND
access_url_id = ".api_get_current_access_url_id().'
ORDER BY c.title';

$result = Database::query($sql);

Expand Down
37 changes: 13 additions & 24 deletions public/main/admin/dashboard_add_sessions_to_user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,12 @@ function search_sessions($needle, $type)
$without_assigned_sessions = ' AND s.id NOT IN('.implode(',', $assigned_sessions_id).')';
}

if (api_is_multiple_url_enabled()) {
$sql = " SELECT s.id, s.title FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a
ON (s.id = a.session_id)
WHERE
s.title LIKE '$needle%' $without_assigned_sessions AND
access_url_id = ".api_get_current_access_url_id();
} else {
$sql = "SELECT s.id, s.title FROM $tbl_session s
WHERE s.title LIKE '$needle%' $without_assigned_sessions ";
}
$sql = " SELECT s.id, s.title FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a
ON (s.id = a.session_id)
WHERE
s.title LIKE '$needle%' $without_assigned_sessions AND
access_url_id = ".api_get_current_access_url_id();
$rs = Database::query($sql);
$return .= '<select class="form-control" id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20">';
while ($session = Database :: fetch_array($rs)) {
Expand Down Expand Up @@ -204,19 +199,13 @@ function remove_item(origin) {
$needle = Database::escape_string($firstLetterSession.'%');
}

if (api_is_multiple_url_enabled()) {
$sql = "SELECT s.id, s.title
FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE
s.title LIKE '$needle%' $without_assigned_sessions AND
access_url_id = ".api_get_current_access_url_id().'
ORDER BY s.title';
} else {
$sql = "SELECT s.id, s.title FROM $tbl_session s
WHERE s.title LIKE '$needle%' $without_assigned_sessions
ORDER BY s.title";
}
$sql = "SELECT s.id, s.title
FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE
s.title LIKE '$needle%' $without_assigned_sessions AND
access_url_id = ".api_get_current_access_url_id().'
ORDER BY s.title';
$result = Database::query($sql);
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id; ?>" style="margin:0px;" <?php if ($ajax_search) {
Expand Down
66 changes: 21 additions & 45 deletions public/main/admin/dashboard_add_users_to_user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,17 @@ function search_users($needle, $type = 'multiple')
$without_assigned_users = ' AND user.id NOT IN('.implode(',', $assigned_users_id).')';
}

if (api_is_multiple_url_enabled()) {
$sql = "SELECT user.id as user_id, username, lastname, firstname
FROM $tbl_user user
LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.id)
WHERE user.active <> ".USER_SOFT_DELETED." AND
".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.STUDENT_BOSS.") AND
user.id NOT IN ($user_anonymous, $current_user_id, $user_id)
$without_assigned_users AND
access_url_id = ".api_get_current_access_url_id()."
$order_clause
";
} else {
$sql = "SELECT id as user_id, username, lastname, firstname
FROM $tbl_user user
WHERE user.active <> ".USER_SOFT_DELETED." AND
".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.STUDENT_BOSS.") AND
id NOT IN ($user_anonymous, $current_user_id, $user_id)
$without_assigned_users
$order_clause
$sql = "SELECT user.id as user_id, username, lastname, firstname
FROM $tbl_user user
LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.id)
WHERE user.active <> ".USER_SOFT_DELETED." AND
".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.STUDENT_BOSS.") AND
user.id NOT IN ($user_anonymous, $current_user_id, $user_id)
$without_assigned_users AND
access_url_id = ".api_get_current_access_url_id()."
$order_clause
";
}
$rs = Database::query($sql);
$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));

Expand Down Expand Up @@ -395,29 +383,17 @@ function remove_item(origin) {
}
}

if (api_is_multiple_url_enabled()) {
$sql = "SELECT user.id as user_id, username, lastname, firstname
FROM $tbl_user user
LEFT JOIN $tbl_access_url_rel_user au
ON (au.user_id = user.id)
WHERE user.active <> ".USER_SOFT_DELETED." AND
$without_assigned_users
user.id NOT IN ($user_anonymous, $current_user_id, $user_id) AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.ANONYMOUS.") $search_user AND
access_url_id = ".api_get_current_access_url_id()."
$sqlConditions
ORDER BY firstname";
} else {
$sql = "SELECT id as user_id, username, lastname, firstname
FROM $tbl_user user
WHERE user.active <> -1 AND
$without_assigned_users
id NOT IN ($user_anonymous, $current_user_id, $user_id) AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.ANONYMOUS.")
$search_user
$sqlConditions
ORDER BY firstname ";
}
$sql = "SELECT user.id as user_id, username, lastname, firstname
FROM $tbl_user user
LEFT JOIN $tbl_access_url_rel_user au
ON (au.user_id = user.id)
WHERE user.active <> ".USER_SOFT_DELETED." AND
$without_assigned_users
user.id NOT IN ($user_anonymous, $current_user_id, $user_id) AND
status NOT IN(".DRH.', '.SESSIONADMIN.', '.ANONYMOUS.") $search_user AND
access_url_id = ".api_get_current_access_url_id()."
$sqlConditions
ORDER BY firstname";
$result = Database::query($sql);
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id; ?>" class="form-horizontal" <?php if ($ajax_search) {
Expand Down
20 changes: 9 additions & 11 deletions public/main/admin/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,16 @@
$mark_all = false;
$un_mark_all = false;

if (api_is_multiple_url_enabled()) {
if (isset($values['buttons_in_action_right']) &&
isset($values['buttons_in_action_right']['mark_all'])
) {
$mark_all = true;
}
if (isset($values['buttons_in_action_right']) &&
isset($values['buttons_in_action_right']['mark_all'])
) {
$mark_all = true;
}

if (isset($values['buttons_in_action_right']) &&
isset($values['buttons_in_action_right']['unmark_all'])
) {
$un_mark_all = true;
}
if (isset($values['buttons_in_action_right']) &&
isset($values['buttons_in_action_right']['unmark_all'])
) {
$un_mark_all = true;
}

if ($mark_all || $un_mark_all) {
Expand Down
Loading

0 comments on commit 74b4426

Please sign in to comment.